diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-13 13:34:58 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-13 13:34:58 -0500 |
| commit | da8abe401ae3859b07c48fb2a5dab4717b6c15cc (patch) | |
| tree | 357eef8306745eabbb7a41b8d81ffe8db7ff7e6e /gnuradio-core/src/lib/runtime/gr_block.cc | |
| parent | a482bd9a29ba643ff148ae392dc359ff53dd7fb9 (diff) | |
| parent | af7d55fda43746ae187bc520952eacf420f8363f (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Diffstat (limited to 'gnuradio-core/src/lib/runtime/gr_block.cc')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_block.cc b/gnuradio-core/src/lib/runtime/gr_block.cc index 33c460e1a0..83bbea37e6 100644 --- a/gnuradio-core/src/lib/runtime/gr_block.cc +++ b/gnuradio-core/src/lib/runtime/gr_block.cc @@ -31,8 +31,8 @@ #include <gr_block_registry.h> gr_block::gr_block (const std::string &name, - gr_io_signature_sptr input_signature, - gr_io_signature_sptr output_signature) + gr_io_signature_sptr input_signature, + gr_io_signature_sptr output_signature) : gr_basic_block(name, input_signature, output_signature), d_output_multiple (1), d_output_multiple_set(false), @@ -43,6 +43,7 @@ gr_block::gr_block (const std::string &name, d_fixed_rate(false), d_max_noutput_items_set(false), d_max_noutput_items(0), + d_min_noutput_items(0), d_tag_propagation_policy(TPP_ALL_TO_ALL), d_pc_rpc_set(false), d_max_output_buffer(std::max(output_signature->max_streams(),1), -1), |