[mlpack-svn] r15225 - mlpack/trunk/src/mlpack

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2013-06-12 10:44:27 -0400 (Wed, 12 Jun 2013)
New Revision: 15225

Modified:
   mlpack/trunk/src/mlpack/core.hpp
Log:
Extra cleanup of Windows' ridiculous #define min and #define max.  Seriously
guys?


Modified: mlpack/trunk/src/mlpack/core.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core.hpp	2013-06-11 20:10:36 UTC (rev 15224)
+++ mlpack/trunk/src/mlpack/core.hpp	2013-06-12 14:44:27 UTC (rev 15225)
@@ -153,18 +153,6 @@
   #define M_PI 3.141592653589793238462643383279
 #endif
 
-// Clean up unfortunate Windows preprocessor definitions.
-// Use std::min and std::max!
-#ifdef _WIN32
-  #ifdef min
-    #undef min
-  #endif
-
-  #ifdef max
-    #undef max
-  #endif
-#endif
-
 // Give ourselves a nice way to force functions to be inline if we need.
 #define force_inline
 #if defined(__GNUG__) && !defined(DEBUG)
@@ -191,3 +179,15 @@
 #include <mlpack/core/dists/gaussian_distribution.hpp>
 
 #endif
+
+// Clean up unfortunate Windows preprocessor definitions, even if this file was
+// already included.  Use std::min and std::max!
+#ifdef _WIN32
+  #ifdef min
+    #undef min
+  #endif
+
+  #ifdef max
+    #undef max
+  #endif
+#endif