diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-02 12:11:22 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-02 12:11:22 -0700 |
| commit | 2d56b2261d5cfaacc51f6c2e651f9f45a10a5462 (patch) | |
| tree | 64beb933f04c136bb5352fdd88f955f8b89eb116 /gr-fec/lib/cc_decoder_impl.cc | |
| parent | 50b66458748057fe19dca5b736cc9ece331905d0 (diff) | |
| parent | 3061e4797af6d308c1f65efca3444923e6beb4fe (diff) | |
Merge branch 'master' into next
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="; |