star-sp

commit 3fc6aebcb22436df28c2b063d0588bd83de365d5
parent 76c91a9239761e4982ff7c72a1009c0f232cd9fd
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Thu,  9 Mar 2017 15:08:06 +0100

Introduce a dedicated preprocessor symbol for boost/random use.

Diffstat:
M
cmake/CMakeLists.txt
 | 
1
+
M
src/ssp_rng_c.h
 | 
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -53,6 +53,7 @@ if(MSVC)
   # Currently, the C++11 random library on MSVC is bugged and consequently we
   # use the Boost library instead
   find_package(Boost 1.58 REQUIRED COMPONENTS random)
+  add_definitions(-DUSE_BOOST_RANDOM)
   include_directories(${RSys_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${Random123_INCLUDE_DIR})
   # Random123 AES generator compiles on MSVC
   add_definitions(-DWITH_R123_AES)
diff --git a/src/ssp_rng_c.h b/src/ssp_rng_c.h
@@ -37,7 +37,7 @@
 
 #define SQRT_2_PI 2.50662827463100050240
 
-#ifdef COMPILER_CL
+#ifdef USE_BOOST_RANDOM
   /* Disable some warnings in boost includes */
   #pragma warning(push)
   #pragma warning(disable:4244) /* possible loss of data due to data conversion */