[mlpack] 105/207: Fix include order to include armadillo before mlpack

[Barak A. Pearlmutter]

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

bap pushed a commit to branch master
in repository mlpack.

commit d6d75a7868423411da3dcf96ea6303d4502e28fa
Author: shikhar <shikharbhardwaj68 at gmail.com>
Date:   Wed Mar 1 21:06:52 2017 +0530

    Fix include order to include armadillo before mlpack
---
 src/mlpack/core/util/backtrace.cpp  | 1 -
 src/mlpack/core/util/cli.hpp        | 2 ++
 src/mlpack/core/util/singletons.cpp | 4 ++--
 src/mlpack/core/util/singletons.hpp | 2 +-
 src/mlpack/tests/mlpack_test.cpp    | 2 --
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/mlpack/core/util/backtrace.cpp b/src/mlpack/core/util/backtrace.cpp
index d1c764f..6e5b222 100644
--- a/src/mlpack/core/util/backtrace.cpp
+++ b/src/mlpack/core/util/backtrace.cpp
@@ -42,7 +42,6 @@
   #include <dlfcn.h>
 #endif
 
-#include "prefixedoutstream.hpp"
 #include "backtrace.hpp"
 #include "log.hpp"
 
diff --git a/src/mlpack/core/util/cli.hpp b/src/mlpack/core/util/cli.hpp
index e55a9ed..1fb37bb 100644
--- a/src/mlpack/core/util/cli.hpp
+++ b/src/mlpack/core/util/cli.hpp
@@ -22,6 +22,8 @@
 #include <boost/any.hpp>
 #include <boost/program_options.hpp>
 
+#include <mlpack/prereqs.hpp>
+
 #include "timers.hpp"
 #include "cli_deleter.hpp" // To make sure we can delete the singleton.
 #include "version.hpp"
diff --git a/src/mlpack/core/util/singletons.cpp b/src/mlpack/core/util/singletons.cpp
index d3ba713..a5cef22 100644
--- a/src/mlpack/core/util/singletons.cpp
+++ b/src/mlpack/core/util/singletons.cpp
@@ -9,9 +9,9 @@
  * 3-clause BSD license along with mlpack.  If not, see
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
-#include "singletons.hpp"
-#include "log.hpp"
 #include "cli.hpp"
+#include "log.hpp"
+#include "singletons.hpp"
 
 using namespace mlpack;
 using namespace mlpack::util;
diff --git a/src/mlpack/core/util/singletons.hpp b/src/mlpack/core/util/singletons.hpp
index f48688a..f126b94 100644
--- a/src/mlpack/core/util/singletons.hpp
+++ b/src/mlpack/core/util/singletons.hpp
@@ -12,8 +12,8 @@
 #ifndef MLPACK_CORE_UTIL_SINGLETONS_HPP
 #define MLPACK_CORE_UTIL_SINGLETONS_HPP
 
-#include "cli_deleter.hpp"
 #include <mlpack/mlpack_export.hpp>
+#include "cli_deleter.hpp"
 
 namespace mlpack {
 namespace util {
diff --git a/src/mlpack/tests/mlpack_test.cpp b/src/mlpack/tests/mlpack_test.cpp
index 3082c7f..54fb1e4 100644
--- a/src/mlpack/tests/mlpack_test.cpp
+++ b/src/mlpack/tests/mlpack_test.cpp
@@ -12,8 +12,6 @@
  */
 #define BOOST_TEST_MODULE mlpackTest
 
-#include <mlpack/core/util/log.hpp>
-
 #include <boost/version.hpp>
 
 // We only need to do this for old Boost versions.

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