diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-16 09:08:13 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-16 09:08:13 -0700 |
commit | 7e689f27b5ddcf060334ce753ec8d3cf850e9b9a (patch) | |
tree | 73bca5612f938a73b95f8a344e75fc67e32a47ce /gr-fec | |
parent | 1e0a12429afdddcf56d525d5464213dbe1e20c9f (diff) | |
parent | f65a6f2e2d61875668b0a5ef07495f8558f6dce8 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'gr-fec')
-rw-r--r-- | gr-fec/include/gnuradio/fec/polar_decoder_common.h | 2 | ||||
-rw-r--r-- | gr-fec/lib/polar_decoder_common.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h index a39ee4f232..13b25ea19b 100644 --- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h +++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h @@ -68,7 +68,7 @@ namespace gr { bool set_frame_size(unsigned int frame_size){return false;}; private: - static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR = -2.19722458f; + static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR; unsigned int d_frozen_bit_counter; protected: diff --git a/gr-fec/lib/polar_decoder_common.cc b/gr-fec/lib/polar_decoder_common.cc index 8fc2e37fb7..1d4a21a191 100644 --- a/gr-fec/lib/polar_decoder_common.cc +++ b/gr-fec/lib/polar_decoder_common.cc @@ -34,6 +34,8 @@ namespace gr { namespace fec { namespace code { + const float polar_decoder_common::D_LLR_FACTOR = -2.19722458f; + polar_decoder_common::polar_decoder_common(int block_size, int num_info_bits, std::vector<int> frozen_bit_positions, std::vector<char> frozen_bit_values) : |