File tree Expand file tree Collapse file tree 1 file changed +14
-3
lines changed Expand file tree Collapse file tree 1 file changed +14
-3
lines changed Original file line number Diff line number Diff line change 8
8
/* -------------------------------------------------------------------------- */
9
9
/* --- INCLUDES ------------------------------------------------------------- */
10
10
/* -------------------------------------------------------------------------- */
11
-
12
- #include " dynamic_graph_bridge/sot_loader_basic.hh"
11
+ // This is imposed by pinocchio through the integration of robot-utils.hh
12
+ #ifdef BOOST_MPL_LIMIT_VECTOR_SIZE
13
+ #pragma push_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
14
+ #undef BOOST_MPL_LIMIT_VECTOR_SIZE
15
+ #include < boost/property_tree/ptree.hpp>
16
+ #include < boost/property_tree/xml_parser.hpp>
17
+ #pragma pop_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
18
+ #else
19
+ #include < boost/property_tree/ptree.hpp>
20
+ #include < boost/property_tree/xml_parser.hpp>
21
+ #endif
13
22
14
23
#include < dynamic-graph/pool.h>
15
24
19
28
#include < sot/core/robot-utils.hh>
20
29
#include < stdexcept>
21
30
31
+ #include " dynamic_graph_bridge/sot_loader_basic.hh"
32
+
22
33
// POSIX.1-2001
23
34
#include < dlfcn.h>
24
35
@@ -29,7 +40,7 @@ namespace po = boost::program_options;
29
40
SotLoaderBasic::SotLoaderBasic (const std::string& aNodeName)
30
41
: ros_node_(nullptr ),
31
42
dynamic_graph_stopped_(true ),
32
- sotController_(NULL ),
43
+ sotController_(nullptr ),
33
44
sotRobotControllerLibrary_(0 ) {
34
45
ros_node_ = dynamic_graph_bridge::get_ros_node (aNodeName);
35
46
You can’t perform that action at this time.
0 commit comments