Skip to content

Commit f904404

Browse files
committed
python: switch include order
1 parent 5f1486c commit f904404

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

doc/python/doxygen-boost.hh

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
#ifndef DOXYGEN_BOOST_DOC_HH
22
#define DOXYGEN_BOOST_DOC_HH
33

4-
#ifndef DOXYGEN_DOC_HH
5-
#error "You should have included doxygen.hh first."
6-
#endif // DOXYGEN_DOC_HH
7-
84
#include <boost/python.hpp>
95

6+
#include "./doxygen.hh"
7+
108
namespace doxygen {
119

1210
namespace visitor {

python/collision.cc

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include "doxygen_autodoc/hpp/fcl/collision_data.h"
4545
#endif
4646

47-
#include "../doc/python/doxygen.hh"
4847
#include "../doc/python/doxygen-boost.hh"
4948

5049
using namespace boost::python;

python/fcl.cc

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
#include "doxygen_autodoc/hpp/fcl/mesh_loader/loader.h"
4747
#endif
4848

49-
#include "../doc/python/doxygen.hh"
5049
#include "../doc/python/doxygen-boost.hh"
5150

5251
using namespace hpp::fcl;

python/fwd.hh

+7-8
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
#ifndef HPP_FCL_PYTHON_FWD_HH
66
#define HPP_FCL_PYTHON_FWD_HH
77

8-
#include <hpp/fcl/fwd.hh>
9-
#ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC
10-
namespace doxygen {
11-
using hpp::fcl::shared_ptr;
12-
}
13-
#endif
14-
158
// Silence a warning about a deprecated use of boost bind by boost python
169
// at least fo boost 1.73 to 1.75
1710
// ref. https://github.com/stack-of-tasks/tsid/issues/128
@@ -20,7 +13,13 @@ using hpp::fcl::shared_ptr;
2013
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
2114
#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
2215

23-
#include "../doc/python/doxygen.hh"
16+
#include <hpp/fcl/fwd.hh>
17+
#ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC
18+
namespace doxygen {
19+
using hpp::fcl::shared_ptr;
20+
}
21+
#endif
22+
2423
#include "../doc/python/doxygen-boost.hh"
2524

2625
namespace bp = boost::python;

0 commit comments

Comments
 (0)