[mlpack-git] master,mlpack-1.0.x: Use prereqs.hpp instead of core.hpp; however, the implementation requires core.hpp. (47eec8c)

[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 47eec8c23b631cb8f6591b8125fc438a4d8ebc18
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue May 27 03:38:38 2014 +0000

    Use prereqs.hpp instead of core.hpp; however, the implementation requires core.hpp.


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

47eec8c23b631cb8f6591b8125fc438a4d8ebc18
 src/mlpack/core/util/save_restore_utility.cpp      | 2 +-
 src/mlpack/core/util/save_restore_utility.hpp      | 2 +-
 src/mlpack/core/util/save_restore_utility_impl.hpp | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mlpack/core/util/save_restore_utility.cpp b/src/mlpack/core/util/save_restore_utility.cpp
index 2a17849..55c531c 100644
--- a/src/mlpack/core/util/save_restore_utility.cpp
+++ b/src/mlpack/core/util/save_restore_utility.cpp
@@ -5,7 +5,7 @@
  * The SaveRestoreUtility provides helper functions in saving and
  *   restoring models.  The current output file type is XML.
  */
-#include "save_restore_utility.hpp"
+#include <mlpack/core.hpp>
 
 using namespace mlpack;
 using namespace mlpack::util;
diff --git a/src/mlpack/core/util/save_restore_utility.hpp b/src/mlpack/core/util/save_restore_utility.hpp
index 433c983..d784794 100644
--- a/src/mlpack/core/util/save_restore_utility.hpp
+++ b/src/mlpack/core/util/save_restore_utility.hpp
@@ -10,6 +10,7 @@
 #ifndef __MLPACK_CORE_UTIL_SAVE_RESTORE_MODEL_HPP
 #define __MLPACK_CORE_UTIL_SAVE_RESTORE_MODEL_HPP
 
+#include <mlpack/prereqs.hpp>
 #include <list>
 #include <map>
 #include <sstream>
@@ -19,7 +20,6 @@
 #include <libxml/tree.h>
 
 #include <boost/tokenizer.hpp>
-#include <mlpack/core.hpp>
 
 namespace mlpack {
 namespace util {
diff --git a/src/mlpack/core/util/save_restore_utility_impl.hpp b/src/mlpack/core/util/save_restore_utility_impl.hpp
index 51468bf..2ae667f 100644
--- a/src/mlpack/core/util/save_restore_utility_impl.hpp
+++ b/src/mlpack/core/util/save_restore_utility_impl.hpp
@@ -10,6 +10,7 @@
 
 // In case it hasn't been included already.
 #include "save_restore_utility.hpp"
+#include "log.hpp"
 
 namespace mlpack {
 namespace util {