[mlpack-git] master: Fix include ordering. (8943424)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed May 20 23:06:02 EDT 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/77d750c8fd46140b1d6060424f68768a21c89377...7e9cd46afb53817ae93ccbd02637d7726137ce4d

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

commit 894342449489bed7207bf29c230937067e24292c
Author: Ryan Curtin <ryan at ratml.org>
Date:   Wed May 20 10:15:41 2015 -0400

    Fix include ordering.


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

894342449489bed7207bf29c230937067e24292c
 src/mlpack/core/tree/binary_space_tree/binary_space_tree.hpp     | 9 ++++++---
 .../tree/binary_space_tree/breadth_first_dual_tree_traverser.hpp | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/core/tree/binary_space_tree/binary_space_tree.hpp b/src/mlpack/core/tree/binary_space_tree/binary_space_tree.hpp
index 7e77690..c358ec0 100644
--- a/src/mlpack/core/tree/binary_space_tree/binary_space_tree.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/binary_space_tree.hpp
@@ -9,7 +9,7 @@
 #include <mlpack/core.hpp>
 
 #include "../statistic.hpp"
-#include "../binary_space_tree.hpp"
+#include "midpoint_split.hpp"
 
 namespace mlpack {
 namespace tree /** Trees and tree-building procedures. */ {
@@ -456,10 +456,13 @@ class BinarySpaceTree
 
 };
 
-}; // namespace tree
-}; // namespace mlpack
+} // namespace tree
+} // namespace mlpack
 
 // Include implementation.
 #include "binary_space_tree_impl.hpp"
 
+// Include everything else, if necessary.
+#include "../binary_space_tree.hpp"
+
 #endif
diff --git a/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser.hpp b/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser.hpp
index 4af0372..1df5f94 100644
--- a/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser.hpp
@@ -13,7 +13,7 @@
 #include <mlpack/core.hpp>
 #include <queue>
 
-#include "binary_space_tree.hpp"
+#include "../binary_space_tree.hpp"
 
 namespace mlpack {
 namespace tree {



More information about the mlpack-git mailing list