[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 06/09: Fix compilation in gcc-6
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 06/09: Fix compilation in gcc-6 |
Date: |
Sun, 21 Feb 2016 15:39:13 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit a1cf11937665392bcfa223a5095ff903eb44c69b
Author: Jaroslav Škarvada <address@hidden>
Date: Fri Feb 12 18:29:13 2016 +0100
Fix compilation in gcc-6
Signed-off-by: Jaroslav Škarvada <address@hidden>
---
gr-fec/include/gnuradio/fec/polar_decoder_common.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
index b0ecb85..a39ee4f 100644
--- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
@@ -28,6 +28,10 @@
#include <gnuradio/fec/generic_decoder.h>
#include <gnuradio/fec/polar_common.h>
+#ifndef BOOST_CONSTEXPR_OR_CONST
+#define BOOST_CONSTEXPR_OR_CONST const
+#endif
+
namespace gr {
namespace fec {
namespace code {
@@ -64,7 +68,7 @@ namespace gr {
bool set_frame_size(unsigned int frame_size){return false;};
private:
- static const float D_LLR_FACTOR = -2.19722458f;
+ static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR = -2.19722458f;
unsigned int d_frozen_bit_counter;
protected:
- [Commit-gnuradio] [gnuradio] branch maint updated (e2c5119 -> 3a2cf6e), git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 07/09: Merge remote-tracking branch 'tom/qtgui_off_by_1' into maint, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 08/09: Merge remote-tracking branch 'mbr0wn/uhd/fix_antenna_split' into maint, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 06/09: Fix compilation in gcc-6,
git <=
- [Commit-gnuradio] [gnuradio] 04/09: uhd: Fix bug #901: Default antenna value causes app to fail, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 03/09: qtgui: fixed a stray +1 that was duplicating tags., git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 09/09: Merge remote-tracking branch 'mbr0wn/blocks/tagged_stream_align_tags' into maint, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 01/09: grc: remove position offset when pasting blocks into an empty flow graph, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 02/09: grc: ignore unknown block keys when pasting blocks, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 05/09: blocks: Fixed bug #903: tagged_stream_align duplicates tags, git, 2016/02/21