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

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

Author: rcurtin
Date: Tue Jul  8 07:48:13 2014
New Revision: 16780

Log:
Move warning to prereqs.hpp, because sometimes prereqs.hpp is included and
core.hpp is not.


Modified:
   mlpack/trunk/src/mlpack/core.hpp
   mlpack/trunk/src/mlpack/prereqs.hpp

Modified: mlpack/trunk/src/mlpack/core.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core.hpp	(original)
+++ mlpack/trunk/src/mlpack/core.hpp	Tue Jul  8 07:48:13 2014
@@ -138,12 +138,7 @@
  *   - Andrew Wells <andrewmw94 at gmail.com>
  */
 
-// First, Check if armadillo was included before, warning if so
-#ifdef ARMA_INCLUDES
-#pragma message "Armadillo was included before mlpack."
-#endif
-
-// Next, include all of the prerequisites.
+// First, include all of the prerequisites.
 #include <mlpack/prereqs.hpp>
 
 // Now the core mlpack classes.

Modified: mlpack/trunk/src/mlpack/prereqs.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/prereqs.hpp	(original)
+++ mlpack/trunk/src/mlpack/prereqs.hpp	Tue Jul  8 07:48:13 2014
@@ -6,7 +6,14 @@
 #ifndef __MLPACK_PREREQS_HPP
 #define __MLPACK_PREREQS_HPP
 
-// First, standard includes.
+// First, check if Armadillo was included before, warning if so.
+#ifdef ARMA_INCLUDES
+#pragma message "Armadillo was included before mlpack; this can sometimes cause\
+problems.  It should only be necessary to include <mlpack/core.hpp> and not\
+<armadillo>."
+#endif
+
+// Next, standard includes.
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>