summaryrefslogtreecommitdiff
path: root/gnuradio-core
diff options
context:
space:
mode:
authorTom Rondeau2012-04-07 16:34:55 -0400
committerTom Rondeau2012-04-07 16:34:55 -0400
commit278cf19287e42a27828ecd6189720a2d88e63d08 (patch)
tree72a945857d4115559ce38cd2e232bcedad4f9a65 /gnuradio-core
parent258d612b4061e490ecd02d29c1346ae74e1dc004 (diff)
parentfdb41fe3399c2282b31297e65f7a020bf844282d (diff)
downloadgnuradio-278cf19287e42a27828ecd6189720a2d88e63d08.tar.gz
gnuradio-278cf19287e42a27828ecd6189720a2d88e63d08.tar.bz2
gnuradio-278cf19287e42a27828ecd6189720a2d88e63d08.zip
Merge branch 'maint'
Diffstat (limited to 'gnuradio-core')
-rw-r--r--gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc5
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);
}
}