Skip to content

Commit eed8db2

Browse files
[sot_loader_basic] Add definition of BOOST_MPL_LIMIT_VECTOR_SIZE because
of pinocchio through robot-utils.hh
1 parent f968fbe commit eed8db2

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

src/sot_loader_basic.cpp

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,17 @@
88
/* -------------------------------------------------------------------------- */
99
/* --- INCLUDES ------------------------------------------------------------- */
1010
/* -------------------------------------------------------------------------- */
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
1322

1423
#include <dynamic-graph/pool.h>
1524

@@ -19,6 +28,8 @@
1928
#include <sot/core/robot-utils.hh>
2029
#include <stdexcept>
2130

31+
#include "dynamic_graph_bridge/sot_loader_basic.hh"
32+
2233
// POSIX.1-2001
2334
#include <dlfcn.h>
2435

@@ -29,7 +40,7 @@ namespace po = boost::program_options;
2940
SotLoaderBasic::SotLoaderBasic(const std::string& aNodeName)
3041
: ros_node_(nullptr),
3142
dynamic_graph_stopped_(true),
32-
sotController_(NULL),
43+
sotController_(nullptr),
3344
sotRobotControllerLibrary_(0) {
3445
ros_node_ = dynamic_graph_bridge::get_ros_node(aNodeName);
3546

0 commit comments

Comments
 (0)