diff options
| author | Tom Rondeau | 2012-04-07 16:35:06 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-04-07 16:35:06 -0400 |
| commit | c5a167406dd7333c130935fa176d8fb503bb8b45 (patch) | |
| tree | e7a434ff4616a87444ebc652349a97782458fd82 /gnuradio-core/src/lib | |
| parent | 81d6389cf749fe5ee13567262f0d547c017fd341 (diff) | |
| parent | 278cf19287e42a27828ecd6189720a2d88e63d08 (diff) | |
| download | gnuradio-c5a167406dd7333c130935fa176d8fb503bb8b45.tar.gz gnuradio-c5a167406dd7333c130935fa176d8fb503bb8b45.tar.bz2 gnuradio-c5a167406dd7333c130935fa176d8fb503bb8b45.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc b/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc index adb1f5608..5c9e4bf3f 100644 --- a/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc +++ b/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc @@ -66,8 +66,9 @@ gr_flat_flowgraph::setup_connections() for(gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) { connect_block_inputs(*p); - gr_block_sptr block = cast_to_block_sptr(*p); - setup_buffer_alignment(block); + gr_block_sptr block = cast_to_block_sptr(*p); + block->set_unaligned(0); + block->set_is_unaligned(false); } } |