diff options
| author | Tom Rondeau <tom@trondeau.com> | 2015-03-13 09:26:43 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2015-03-13 09:26:43 -0400 |
| commit | 13cf0ce205bfc986e462591764cb7ca16e21346c (patch) | |
| tree | 69bac5f75246eb362e4d4910c7d872fa68c48748 /gr-blocks/include | |
| parent | adb12aaf8fc3f80fbacac1e387438a2c41d44fed (diff) | |
| parent | 118f26a4ac15b26cd64066c512c1343be1ab84bb (diff) | |
Merge remote-tracking branch 'mbant/blocks/bug_742' into maint
Diffstat (limited to 'gr-blocks/include')
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t index 56a8b1b707..20931f1cc7 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t @@ -91,10 +91,9 @@ namespace gr { */ virtual void set_tag_propagation_policy(gr::block::tag_propagation_policy_t p) = 0; - static const int TPP_SELECT_BY_MATRIX = 999; + static const int TPP_SELECT_BY_MATRIX; static const std::string MSG_PORT_NAME_SET_A; }; - const std::string @NAME@::MSG_PORT_NAME_SET_A = "set_A"; } // namespace blocks } // namespace gr |