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.h | |
parent | 50b66458748057fe19dca5b736cc9ece331905d0 (diff) | |
parent | 3061e4797af6d308c1f65efca3444923e6beb4fe (diff) |
Merge branch 'master' into next
Diffstat (limited to 'gr-fec/lib/cc_decoder_impl.h')
-rw-r--r-- | gr-fec/lib/cc_decoder_impl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gr-fec/lib/cc_decoder_impl.h b/gr-fec/lib/cc_decoder_impl.h index 33ced0250c..643f4b8717 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, |