[mlpack-git] master, mlpack-1.0.x: Added check to solve ticket 347. Note that this does not changeany functionality, just adds a warning. (963c74d)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branches: master,mlpack-1.0.x
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

>---------------------------------------------------------------

commit 963c74de61cf9b62a73c7cac40b19d08a8f9cd4b
Author: birm <birm at gatech.edu>
Date:   Mon Jul 7 20:44:41 2014 +0000

    Added check to solve ticket 347. Note that this does not changeany functionality, just adds a warning.


>---------------------------------------------------------------

963c74de61cf9b62a73c7cac40b19d08a8f9cd4b
 src/mlpack/core.hpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mlpack/core.hpp b/src/mlpack/core.hpp
index a6374f0..d39dff0 100644
--- a/src/mlpack/core.hpp
+++ b/src/mlpack/core.hpp
@@ -138,7 +138,12 @@
  *   - Andrew Wells <andrewmw94 at gmail.com>
  */
 
-// First, include all of the prerequisites.
+// 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.
 #include <mlpack/prereqs.hpp>
 
 // Now the core mlpack classes.