make #defines consistent across all versions of visual studio, to red…

…uce testing needed
smallcattom · Apr 1, 2015 · 9c58a3f · 9c58a3f
1 parent 935d07e
commit 9c58a3f
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 52 deletions.
diff --git a/PyClConvolve/PyClConvolve.cpp b/PyClConvolve/PyClConvolve.cpp
diff --git a/src/MyRandom.h b/src/MyRandom.h
@@ -10,11 +10,13 @@
 
 #include "mt19937defs.h"
 
-#if (_MSC_VER == 1500 || _MSC_VER == 1600  )
+//#if (_MSC_VER == 1500 || _MSC_VER == 1600  )
+#ifdef _MSC_VER // make consistent across all msvc versions, so dont have to retest on different msvc versions...
 #define TR1RANDOM
 #endif
 
-#if (_MSC_VER == 1500 || _MSC_VER == 1600 ) // visual studio 2008
+//#if (_MSC_VER == 1500 || _MSC_VER == 1600 ) // visual studio 2008
+#ifdef _MSC_VER // make consistent across all msvc versions, so dont have to retest on different msvc versions...
 #define NOCHRONO
 #include <ctime>
 #else

diff --git a/src/StatefulTimer.h b/src/StatefulTimer.h
@@ -8,7 +8,8 @@
 
 #include <iostream>
 
-#if (_MSC_VER == 1500 || _MSC_VER == 1600 ) // visual studio 2008 or 2010
+//#if (_MSC_VER == 1500 || _MSC_VER == 1600 ) // visual studio 2008 or 2010
+#ifdef _MSC_VER // make consistent across all msvc versions, so dont have to retest on different msvc versions...
 #define WINNOCHRONO
 //#include <ctime>
 #define NOMINMAX // prevents errors compiling std::max and std::min

diff --git a/src/Timer.h b/src/Timer.h
@@ -8,7 +8,8 @@
 
 #include <iostream>
 
-#if (_MSC_VER == 1500 || _MSC_VER == 1600 ) // visual studio 2008 or 2010
+//#if (_MSC_VER == 1500 || _MSC_VER == 1600 ) // visual studio 2008 or 2010
+#ifdef _MSC_VER // make consistent across all msvc versions, so dont have to retest on different msvc versions...
 #define WINNOCHRONO 
 #define NOMINMAX // prevents errors compiling std::max and std::min
 #include <windows.h>

diff --git a/src/mt19937defs.h b/src/mt19937defs.h
@@ -2,7 +2,8 @@
 
 #include <random>
 
-#if (_MSC_VER == 1500 || _MSC_VER == 1600  )
+//#if (_MSC_VER == 1500 || _MSC_VER == 1600  )
+#ifdef _MSC_VER // make consistent across all msvc versions, so dont have to retest on different msvc versions...
 #define TR1RANDOM
 typedef std::tr1::mt19937 MT19937;
 #else

diff --git a/test/prepare-norb.cpp b/test/prepare-norb.cpp
@@ -18,7 +18,8 @@
 
 #include "NorbLoader.h"
 
-#if (_MSC_VER == 1500 || _MSC_VER == 1600  )
+//#if (_MSC_VER == 1500 || _MSC_VER == 1600  )
+#ifdef _MSC_VER // make consistent across all msvc versions, so dont have to retest on different msvc versions...
 #define TR1RANDOM
 typedef std::tr1::mt19937 MT19937;
 #else

diff --git a/test/testsinglebatch.cpp b/test/testsinglebatch.cpp
@@ -14,7 +14,8 @@
 #include "test/TestArgsParser.h"
 #include "Timer.h"
 
-#if (_MSC_VER == 1500 || _MSC_VER == 1600  )
+//#if (_MSC_VER == 1500 || _MSC_VER == 1600  )
+#ifdef _MSC_VER // make consistent across all msvc versions, so dont have to retest on different msvc versions...
 #define TR1RANDOM
 typedef std::tr1::mt19937 MT19937;
 #define isnan _isnan