[mlpack] 141/324: Move warning to prereqs.hpp, because sometimes prereqs.hpp is included and core.hpp is not.

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch svn-trunk
in repository mlpack.

commit 2d19ffc006669bb08b4f265ec8943af1a8ee4118
Author: rcurtin <rcurtin at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date:   Tue Jul 8 11:48:13 2014 +0000

    Move warning to prereqs.hpp, because sometimes prereqs.hpp is included and
    core.hpp is not.
    
    
    git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@16780 9d5b8971-822b-0410-80eb-d18c1038ef23
---
 src/mlpack/core.hpp    | 7 +------
 src/mlpack/prereqs.hpp | 9 ++++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/mlpack/core.hpp b/src/mlpack/core.hpp
index d39dff0..a6374f0 100644
--- a/src/mlpack/core.hpp
+++ b/src/mlpack/core.hpp
@@ -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.
diff --git a/src/mlpack/prereqs.hpp b/src/mlpack/prereqs.hpp
index 1c15dae..fa18340 100644
--- a/src/mlpack/prereqs.hpp
+++ b/src/mlpack/prereqs.hpp
@@ -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>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git