[mlpack] 164/207: include mlpack/core.hpp before arma_extend.hpp to prevent some weird bugs

Barak A. Pearlmutter barak+git at pearlmutter.net
Thu Mar 23 17:53:50 UTC 2017


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

bap pushed a commit to branch master
in repository mlpack.

commit 4c1a8464c17ec26c1799faea5b2b0c1f7ace64c6
Author: stereomatchingkiss <stereomatchingkiss at gmail.com>
Date:   Wed Jun 8 14:32:53 2016 +0800

    include mlpack/core.hpp before arma_extend.hpp to prevent some weird bugs
---
 src/mlpack/core/data/load_csv.hpp  | 5 +++--
 src/mlpack/core/data/load_impl.hpp | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mlpack/core/data/load_csv.hpp b/src/mlpack/core/data/load_csv.hpp
index 0a16961..bcb3af1 100644
--- a/src/mlpack/core/data/load_csv.hpp
+++ b/src/mlpack/core/data/load_csv.hpp
@@ -7,11 +7,12 @@
 #ifndef MLPACK_CORE_DATA_LOAD_CSV_HPP
 #define MLPACK_CORE_DATA_LOAD_CSV_HPP
 
-#include <boost/spirit/include/qi.hpp>
-
+#include <mlpack/core.hpp>
 #include <mlpack/core/util/log.hpp>
 #include <mlpack/core/arma_extend/arma_extend.hpp> // Includes Armadillo.
 
+#include <boost/spirit/include/qi.hpp>
+
 #include <unordered_set>
 #include <string>
 
diff --git a/src/mlpack/core/data/load_impl.hpp b/src/mlpack/core/data/load_impl.hpp
index 5ff8067..4fea5ce 100644
--- a/src/mlpack/core/data/load_impl.hpp
+++ b/src/mlpack/core/data/load_impl.hpp
@@ -14,8 +14,8 @@
 
 // In case it hasn't already been included.
 #include "load.hpp"
-#include "extension.hpp"
 #include "load_csv.hpp"
+#include "extension.hpp"
 
 #include <exception>
 #include <algorithm>

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



More information about the debian-science-commits mailing list