[Commit-gnuradio] [gnuradio] 40/43: fec: Move the definition of yp_kernel from the class into a temp variable in the main code. This variable is used just to find the actual Volk kernel, and its current use is not c++11 complaint. Moving it makes the code c++11 complaint on both GCC / libstdc++ and Clang / libc++.

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 4f5211f016af30428ef6b40bc35c09f5e54ecd64
Author: Michael Dickens <address@hidden>
Date:   Thu Apr 2 15:01:46 2015 -0400

    fec: Move the definition of yp_kernel from the class into a temp variable 
in the main code. This variable is used just to find the actual Volk kernel, 
and its current use is not c++11 complaint. Moving it makes the code c++11 
complaint on both GCC / libstdc++ and Clang / libc++.
---
 gr-fec/lib/cc_decoder_impl.cc | 2 +-
 gr-fec/lib/cc_decoder_impl.h  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/gr-fec/lib/cc_decoder_impl.cc b/gr-fec/lib/cc_decoder_impl.cc
index 20587a2..be505e2 100644
--- a/gr-fec/lib/cc_decoder_impl.cc
+++ b/gr-fec/lib/cc_decoder_impl.cc
@@ -147,7 +147,7 @@ namespace gr {
           d_SUBSHIFT = 0;
         }
 
-        yp_kernel = boost::assign::map_list_of("k=7r=2", 
volk_8u_x4_conv_k7_r2_8u);
+        std::map<std::string, conv_kernel> yp_kernel = 
boost::assign::map_list_of("k=7r=2", volk_8u_x4_conv_k7_r2_8u);
 
         std::string k_ = "k=";
         std::string r_ = "r=";
diff --git a/gr-fec/lib/cc_decoder_impl.h b/gr-fec/lib/cc_decoder_impl.h
index 33ced02..643f4b8 100644
--- a/gr-fec/lib/cc_decoder_impl.h
+++ b/gr-fec/lib/cc_decoder_impl.h
@@ -85,7 +85,6 @@ namespace gr {
         int parity(int x);
         int parityb(unsigned char x);
         void partab_init(void);
-        std::map<std::string, conv_kernel> yp_kernel;
 
       public:
         cc_decoder_impl(int frame_size, int k,