diff options
| author | Michael Dickens <michael.dickens@ettus.com> | 2015-04-02 15:01:46 -0400 |
|---|---|---|
| committer | Michael Dickens <michael.dickens@ettus.com> | 2015-04-02 15:01:46 -0400 |
| commit | 4f5211f016af30428ef6b40bc35c09f5e54ecd64 (patch) | |
| tree | 10de90e6da057e3257fa0bf94bcebc0acab70c55 /gr-fec/lib/cc_decoder_impl.cc | |
| parent | 225c6b33730b8812ba82cbc93884aef7edcaad1c (diff) | |
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++.
Diffstat (limited to 'gr-fec/lib/cc_decoder_impl.cc')
| -rw-r--r-- | gr-fec/lib/cc_decoder_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-fec/lib/cc_decoder_impl.cc b/gr-fec/lib/cc_decoder_impl.cc index 20587a21ae..be505e2f8e 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="; |