diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-13 16:45:14 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-13 16:45:14 -0500 |
| commit | f243f721607ac9a5cfbea2dbdd66a1cc8b1921ef (patch) | |
| tree | 3e6398b5fd00c460cc0f902c36fa1aee7130fc49 /gnuradio-core | |
| parent | 5a6ae80bcbf4b626e47bbbbfc50e3ea1725b4e46 (diff) | |
| parent | f27c67056a09ffb73b127471c1b757ecb36d933e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_block.h b/gnuradio-core/src/lib/runtime/gr_block.h index ee69309169..8b8851ee92 100644 --- a/gnuradio-core/src/lib/runtime/gr_block.h +++ b/gnuradio-core/src/lib/runtime/gr_block.h @@ -463,9 +463,9 @@ class GR_CORE_API gr_block : public gr_basic_block { gr_block_detail_sptr d_detail; // implementation details unsigned d_history; bool d_fixed_rate; - int d_min_noutput_items; bool d_max_noutput_items_set; // if d_max_noutput_items is valid int d_max_noutput_items; // value of max_noutput_items for this block + int d_min_noutput_items; tag_propagation_policy_t d_tag_propagation_policy; // policy for moving tags downstream std::vector<unsigned int> d_affinity; // thread affinity proc. mask bool d_pc_rpc_set; |