[mlpack-git] master: Refactor includes to include serialization code. (840f1cf)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/4a97187bbba7ce8a6191b714949dd818ef0f37d2...e5905e62c15d1bcff21e6359b11efcd7ab6d7ca0

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

commit 840f1cf07842d87d3c1e85fd0fe78bb1750bbed7
Author: ryan <ryan at ratml.org>
Date:   Fri Apr 17 12:28:29 2015 -0400

    Refactor includes to include serialization code.


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

840f1cf07842d87d3c1e85fd0fe78bb1750bbed7
 src/mlpack/core/data/serialization_shim.hpp | 3 +--
 src/mlpack/core/util/sfinae_utility.hpp     | 1 -
 src/mlpack/prereqs.hpp                      | 5 +++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mlpack/core/data/serialization_shim.hpp b/src/mlpack/core/data/serialization_shim.hpp
index b543fb3..ac046c0 100644
--- a/src/mlpack/core/data/serialization_shim.hpp
+++ b/src/mlpack/core/data/serialization_shim.hpp
@@ -11,10 +11,9 @@
 #ifndef __MLPACK_CORE_UTIL_SERIALIZATION_SHIM_HPP
 #define __MLPACK_CORE_UTIL_SERIALIZATION_SHIM_HPP
 
-#include <mlpack/prereqs.hpp>
+#include <mlpack/core/util/sfinae_utility.hpp>
 #include <boost/serialization/serialization.hpp>
 #include <boost/archive/xml_oarchive.hpp>
-#include <mlpack/core/util/sfinae_utility.hpp>
 
 namespace mlpack {
 namespace data {
diff --git a/src/mlpack/core/util/sfinae_utility.hpp b/src/mlpack/core/util/sfinae_utility.hpp
index 3a603b2..cc856b4 100644
--- a/src/mlpack/core/util/sfinae_utility.hpp
+++ b/src/mlpack/core/util/sfinae_utility.hpp
@@ -12,7 +12,6 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits.hpp>
-#include <mlpack/prereqs.hpp>
 
 /*
  * Constructs a template supporting the SFINAE pattern.
diff --git a/src/mlpack/prereqs.hpp b/src/mlpack/prereqs.hpp
index 21b726f..e2e9ab0 100644
--- a/src/mlpack/prereqs.hpp
+++ b/src/mlpack/prereqs.hpp
@@ -45,6 +45,11 @@
   #define force_inline __forceinline
 #endif
 
+// We'll need the necessary boost::serialization features, as well as what we
+// use with mlpack.
+#include <boost/serialization/serialization.hpp>
+#include <mlpack/core/data/serialization_shim.hpp>
+
 // Now include Armadillo through the special mlpack extensions.
 #include <mlpack/core/arma_extend/arma_extend.hpp>