python: switch include order

coal-library · Apr 2, 2022 · f904404 · f904404
1 parent 5f1486c
commit f904404
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/doc/python/doxygen-boost.hh b/doc/python/doxygen-boost.hh
@@ -1,12 +1,10 @@
 #ifndef DOXYGEN_BOOST_DOC_HH
 #define DOXYGEN_BOOST_DOC_HH
 
-#ifndef DOXYGEN_DOC_HH
-#error "You should have included doxygen.hh first."
-#endif  // DOXYGEN_DOC_HH
-
 #include <boost/python.hpp>
 
+#include "./doxygen.hh"
+
 namespace doxygen {
 
 namespace visitor {

diff --git a/python/collision.cc b/python/collision.cc
@@ -44,7 +44,6 @@
 #include "doxygen_autodoc/hpp/fcl/collision_data.h"
 #endif
 
-#include "../doc/python/doxygen.hh"
 #include "../doc/python/doxygen-boost.hh"
 
 using namespace boost::python;

diff --git a/python/fcl.cc b/python/fcl.cc
@@ -46,7 +46,6 @@
 #include "doxygen_autodoc/hpp/fcl/mesh_loader/loader.h"
 #endif
 
-#include "../doc/python/doxygen.hh"
 #include "../doc/python/doxygen-boost.hh"
 
 using namespace hpp::fcl;

diff --git a/python/fwd.hh b/python/fwd.hh
@@ -5,13 +5,6 @@
 #ifndef HPP_FCL_PYTHON_FWD_HH
 #define HPP_FCL_PYTHON_FWD_HH
 
-#include <hpp/fcl/fwd.hh>
-#ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC
-namespace doxygen {
-using hpp::fcl::shared_ptr;
-}
-#endif
-
 // Silence a warning about a deprecated use of boost bind by boost python
 // at least fo boost 1.73 to 1.75
 // ref. https://github.com/stack-of-tasks/tsid/issues/128
@@ -20,7 +13,13 @@ using hpp::fcl::shared_ptr;
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 #undef BOOST_BIND_GLOBAL_PLACEHOLDERS
 
-#include "../doc/python/doxygen.hh"
+#include <hpp/fcl/fwd.hh>
+#ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC
+namespace doxygen {
+using hpp::fcl::shared_ptr;
+}
+#endif
+
 #include "../doc/python/doxygen-boost.hh"
 
 namespace bp = boost::python;