sharkcz / rpms / gnuradio

Forked from rpms/gnuradio 3 years ago
Clone
b2f5f35
diff --git a/CMakeLists.txt b/CMakeLists.txt
b2f5f35
index 0ac65fe..71378aa 100644
b2f5f35
--- a/CMakeLists.txt
b2f5f35
+++ b/CMakeLists.txt
b2f5f35
@@ -62,7 +62,7 @@ ENDIF()
b2f5f35
 # set(CMAKE_CXX_STANDARD 98)
b2f5f35
 
b2f5f35
 IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
b2f5f35
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
b2f5f35
+#    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
b2f5f35
 ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
b2f5f35
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
b2f5f35
 ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
b2f5f35
@@ -72,7 +72,7 @@ ELSE()
b2f5f35
 ENDIF()
b2f5f35
 
b2f5f35
 IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
b2f5f35
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
b2f5f35
+#    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
b2f5f35
 ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
b2f5f35
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
b2f5f35
 ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
b2f5f35
diff --git a/gnuradio-runtime/lib/math/qa_fxpt.h b/gnuradio-runtime/lib/math/qa_fxpt.h
b2f5f35
index 58a6f02..6020e47 100644
b2f5f35
--- a/gnuradio-runtime/lib/math/qa_fxpt.h
b2f5f35
+++ b/gnuradio-runtime/lib/math/qa_fxpt.h
b2f5f35
@@ -25,6 +25,7 @@
b2f5f35
 
b2f5f35
 #include <cppunit/extensions/HelperMacros.h>
b2f5f35
 #include <cppunit/TestCase.h>
b2f5f35
+#include <memory>
b2f5f35
 
b2f5f35
 class qa_fxpt : public CppUnit::TestCase
b2f5f35
 {
b2f5f35
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.h b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
b2f5f35
index 1b2cdae..1755904 100644
b2f5f35
--- a/gnuradio-runtime/lib/math/qa_fxpt_nco.h
b2f5f35
+++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
b2f5f35
@@ -25,6 +25,7 @@
b2f5f35
 
b2f5f35
 #include <cppunit/extensions/HelperMacros.h>
b2f5f35
 #include <cppunit/TestCase.h>
b2f5f35
+#include <memory>
b2f5f35
 
b2f5f35
 class qa_fxpt_nco : public CppUnit::TestCase
b2f5f35
 {
b2f5f35
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.h b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
b2f5f35
index 72693f3..76e0b6d 100644
b2f5f35
--- a/gnuradio-runtime/lib/math/qa_fxpt_vco.h
b2f5f35
+++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
b2f5f35
@@ -25,6 +25,7 @@
b2f5f35
 
b2f5f35
 #include <cppunit/extensions/HelperMacros.h>
b2f5f35
 #include <cppunit/TestCase.h>
b2f5f35
+#include <memory>
b2f5f35
 
b2f5f35
 class qa_fxpt_vco : public CppUnit::TestCase
b2f5f35
 {
b2f5f35
diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
b2f5f35
index 13b25ea..8a3d65d 100644
b2f5f35
--- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
b2f5f35
+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
b2f5f35
@@ -68,7 +68,7 @@ namespace gr {
b2f5f35
         bool set_frame_size(unsigned int frame_size){return false;};
b2f5f35
 
b2f5f35
       private:
b2f5f35
-        static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR;
b2f5f35
+        static const float D_LLR_FACTOR;
b2f5f35
         unsigned int d_frozen_bit_counter;
b2f5f35
 
b2f5f35
       protected: