[Commit-gnuradio] [gnuradio] 01/04: blocks: Fixed static init of matrix_multiply members

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch maint
in repository gnuradio.

commit 118f26a4ac15b26cd64066c512c1343be1ab84bb
Author: Martin Braun <address@hidden>
Date:   Wed Mar 11 15:43:18 2015 -0700

    blocks: Fixed static init of matrix_multiply members
---
 gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t | 3 +--
 gr-blocks/lib/multiply_matrix_cc_impl.cc                 | 3 +++
 gr-blocks/lib/multiply_matrix_ff_impl.cc                 | 3 +++
 3 files changed, 7 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 56a8b1b..20931f1 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
diff --git a/gr-blocks/lib/multiply_matrix_cc_impl.cc 
b/gr-blocks/lib/multiply_matrix_cc_impl.cc
index eaa902e..603347d 100644
--- a/gr-blocks/lib/multiply_matrix_cc_impl.cc
+++ b/gr-blocks/lib/multiply_matrix_cc_impl.cc
@@ -31,6 +31,9 @@
 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
     multiply_matrix_cc::make(std::vector<std::vector<gr_complex> > A, 
gr::block::tag_propagation_policy_t tag_propagation_policy)
     {
diff --git a/gr-blocks/lib/multiply_matrix_ff_impl.cc 
b/gr-blocks/lib/multiply_matrix_ff_impl.cc
index fb0a6d5..43f8e24 100644
--- a/gr-blocks/lib/multiply_matrix_ff_impl.cc
+++ b/gr-blocks/lib/multiply_matrix_ff_impl.cc
@@ -31,6 +31,9 @@
 namespace gr {
   namespace blocks {
 
+    const int multiply_matrix_ff::TPP_SELECT_BY_MATRIX = 999;
+    const std::string multiply_matrix_ff::MSG_PORT_NAME_SET_A = "set_A";
+
     multiply_matrix_ff::sptr
     multiply_matrix_ff::make(std::vector<std::vector<float> > A, 
gr::block::tag_propagation_policy_t tag_propagation_policy)
     {