forked from pool/gnuradio
- Add patches to fix builds on Factory + 0001-gr-fec-switch-possible-C-11-code-from-constexpr-to-j.patch + CMake-set-C++-standard-to-c++11-and-C-standard-to-C99.diff OBS-URL: https://build.opensuse.org/request/show/497388 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=10
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From cee483f7851f13e797b75d08934b5d779aca5d49 Mon Sep 17 00:00:00 2001
|
|
From: Michael Dickens <michael.dickens@ettus.com>
|
|
Date: Fri, 10 Mar 2017 12:35:05 -0500
|
|
Subject: [PATCH] gr-fec: switch possible C++11 code from 'constexpr' to just
|
|
'const'.
|
|
|
|
---
|
|
gr-fec/include/gnuradio/fec/polar_decoder_common.h | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
|
index 13b25ea19..c160f4b87 100644
|
|
--- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
|
+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
|
@@ -28,10 +28,6 @@
|
|
#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 {
|
|
@@ -68,7 +64,7 @@ namespace gr {
|
|
bool set_frame_size(unsigned int frame_size){return false;};
|
|
|
|
private:
|
|
- static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR;
|
|
+ static const float D_LLR_FACTOR;
|
|
unsigned int d_frozen_bit_counter;
|
|
|
|
protected:
|
|
--
|
|
2.12.0
|
|
|