diff options
| author | Marcus Müller <marcus@hostalia.de> | 2017-06-24 17:43:22 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2017-06-24 17:44:53 +0200 |
| commit | 963c376ba23fbcb7c4041b8ce5ff1d30b33af36e (patch) | |
| tree | a2393332a049616d240323d236abba203627ce66 /gr-blocks/lib/multiply_matrix_cc_impl.cc | |
| parent | b57a37f7c676542f08a27d3f141f4d9ed2ab1132 (diff) | |
fix: can't pass non-enum integer as enum parameter (#1337)
Diffstat (limited to 'gr-blocks/lib/multiply_matrix_cc_impl.cc')
| -rw-r--r-- | gr-blocks/lib/multiply_matrix_cc_impl.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/gr-blocks/lib/multiply_matrix_cc_impl.cc b/gr-blocks/lib/multiply_matrix_cc_impl.cc index 7ecf3e95ce..15fc0fc814 100644 --- a/gr-blocks/lib/multiply_matrix_cc_impl.cc +++ b/gr-blocks/lib/multiply_matrix_cc_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2014 Free Software Foundation, Inc. + * Copyright 2014,2017 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -31,7 +31,6 @@ namespace gr { namespace blocks { - const int multiply_matrix_cc::TPP_SELECT_BY_MATRIX = 999; const std::string multiply_matrix_cc::MSG_PORT_NAME_SET_A = "set_A"; multiply_matrix_cc::sptr @@ -85,7 +84,7 @@ namespace gr { } } } - if (d_tag_prop_select) { + if (tag_propagation_policy() == TPP_CUSTOM) { propagate_tags_by_A(noutput_items, input_items.size(), output_items.size()); } return noutput_items; @@ -178,17 +177,6 @@ namespace gr { } } - void - multiply_matrix_cc_impl::set_tag_propagation_policy(gr::block::tag_propagation_policy_t tpp) - { - if (tpp == TPP_SELECT_BY_MATRIX) { - set_tag_propagation_policy(TPP_DONT); - d_tag_prop_select = true; - } else { - gr::block::set_tag_propagation_policy(tpp); - d_tag_prop_select = false; - } - } } /* namespace blocks */ } /* namespace gr */ |