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

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Wed Mar 13 16:52:18 EDT 2013


Author: rcurtin
Date: 2013-03-13 16:52:18 -0400 (Wed, 13 Mar 2013)
New Revision: 14549

Modified:
   mlpack/trunk/src/mlpack/core.hpp
Log:
All definitions should come before mlpack includes.


Modified: mlpack/trunk/src/mlpack/core.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core.hpp	2013-03-13 20:46:41 UTC (rev 14548)
+++ mlpack/trunk/src/mlpack/core.hpp	2013-03-13 20:52:18 UTC (rev 14549)
@@ -150,21 +150,6 @@
   #define M_PI 3.141592653589793238462643383279
 #endif
 
-// Now MLPACK-specific includes.
-#include <mlpack/core/arma_extend/arma_extend.hpp> // Includes Armadillo.
-#include <mlpack/core/util/log.hpp>
-#include <mlpack/core/util/cli.hpp>
-#include <mlpack/core/data/load.hpp>
-#include <mlpack/core/data/save.hpp>
-#include <mlpack/core/math/clamp.hpp>
-#include <mlpack/core/math/random.hpp>
-#include <mlpack/core/math/lin_alg.hpp>
-#include <mlpack/core/math/range.hpp>
-#include <mlpack/core/math/round.hpp>
-#include <mlpack/core/util/save_restore_utility.hpp>
-#include <mlpack/core/dists/discrete_distribution.hpp>
-#include <mlpack/core/dists/gaussian_distribution.hpp>
-
 // Clean up unfortunate Windows preprocessor definitions.
 // Use std::min and std::max!
 #ifdef _WIN32
@@ -187,4 +172,19 @@
   #define force_inline __forceinline
 #endif
 
+// Now MLPACK-specific includes.
+#include <mlpack/core/arma_extend/arma_extend.hpp> // Includes Armadillo.
+#include <mlpack/core/util/log.hpp>
+#include <mlpack/core/util/cli.hpp>
+#include <mlpack/core/data/load.hpp>
+#include <mlpack/core/data/save.hpp>
+#include <mlpack/core/math/clamp.hpp>
+#include <mlpack/core/math/random.hpp>
+#include <mlpack/core/math/lin_alg.hpp>
+#include <mlpack/core/math/range.hpp>
+#include <mlpack/core/math/round.hpp>
+#include <mlpack/core/util/save_restore_utility.hpp>
+#include <mlpack/core/dists/discrete_distribution.hpp>
+#include <mlpack/core/dists/gaussian_distribution.hpp>
+
 #endif




More information about the mlpack-svn mailing list