Commit 70b28797 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

include pinocchio before boost

parent 59a75dc5
...@@ -12,43 +12,16 @@ ...@@ -12,43 +12,16 @@
/* --- INCLUDE --------------------------------------------------------- */ /* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/** pinocchio is forcing the BOOST_MPL_LIMIT_VECTOR_SIZE to a specific value. #include <map>
This happen to be not working when including the boost property_tree
library. For this reason if defined, the current value of
BOOST_MPL_LIMIT_VECTOR_SIZE is saved in the preprocessor stack and unset.
Once the property_tree included the pinocchio value of this variable is
restored.
*/
#ifdef BOOST_MPL_LIMIT_VECTOR_SIZE
#pragma push_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
#define UNDEF_BOOST_MPL_LIMIT_VECTOR_SIZE
#undef BOOST_MPL_LIMIT_VECTOR_SIZE
#endif
#ifdef BOOST_MPL_LIMIT_LIST_SIZE #include <pinocchio/fwd.hpp>
#pragma push_macro("BOOST_MPL_LIMIT_LIST_SIZE")
#define UNDEF_BOOST_MPL_LIMIT_LIST_SIZE
#undef BOOST_MPL_LIMIT_LIST_SIZE
#endif
#include <boost/assign.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#ifdef UNDEF_BOOST_MPL_LIMIT_VECTOR_SIZE
#pragma pop_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
#undef UNDEF_BOOST_MPL_LIMIT_VECTOR_SIZE
#endif
#ifdef UNDEF_BOOST_MPL_LIMIT_LIST_SIZE
#pragma pop_macro("BOOST_MPL_LIMIT_LIST_SIZE")
#undef UNDEF_BOOST_MPL_LIMIT_LIST_SIZE
#endif
#include "boost/assign.hpp"
#include <dynamic-graph/linear-algebra.h> #include <dynamic-graph/linear-algebra.h>
#include <dynamic-graph/logger.h> #include <dynamic-graph/logger.h>
#include <dynamic-graph/signal-helper.h> #include <dynamic-graph/signal-helper.h>
#include <map>
#include <sot/core/matrix-geometry.hh> #include <sot/core/matrix-geometry.hh>
namespace dynamicgraph { namespace dynamicgraph {
......
...@@ -14,26 +14,14 @@ ...@@ -14,26 +14,14 @@
* with sot-torque-control. If not, see <http://www.gnu.org/licenses/>. * with sot-torque-control. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** pinocchio is forcing the BOOST_MPL_LIMIT_VECTOR_SIZE to a specific value. #include <iostream>
This happen to be not working when including the boost property_tree
library. For this reason if defined, the current value of #include <pinocchio/fwd.hpp>
BOOST_MPL_LIMIT_VECTOR_SIZE is saved in the preprocessor stack and unset.
Once the property_tree included the pinocchio value of this variable is
restored.
*/
#ifdef BOOST_MPL_LIMIT_VECTOR_SIZE
#pragma push_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
#undef BOOST_MPL_LIMIT_VECTOR_SIZE
#include <boost/property_tree/ptree.hpp>
#pragma pop_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
#else
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#endif
#include <dynamic-graph/all-commands.h> #include <dynamic-graph/all-commands.h>
#include <dynamic-graph/factory.h> #include <dynamic-graph/factory.h>
#include <iostream>
#include <sot/core/debug.hh> #include <sot/core/debug.hh>
#include <sot/core/exception-tools.hh> #include <sot/core/exception-tools.hh>
#include <sot/core/parameter-server.hh> #include <sot/core/parameter-server.hh>
......
...@@ -4,18 +4,15 @@ ...@@ -4,18 +4,15 @@
* This file is part of sot-core. * This file is part of sot-core.
* See license file. * See license file.
*/ */
#ifdef BOOST_MPL_LIMIT_VECTOR_SIZE
#pragma push_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
#undef BOOST_MPL_LIMIT_VECTOR_SIZE
#include <boost/property_tree/ptree.hpp>
#pragma pop_macro("BOOST_MPL_LIMIT_VECTOR_SIZE")
#else
#include <boost/property_tree/ptree.hpp>
#endif
#include <pinocchio/fwd.hpp>
#include <boost/property_tree/ptree.hpp>
#include <boost/python.hpp> #include <boost/python.hpp>
#include <boost/python/suite/indexing/map_indexing_suite.hpp> #include <boost/python/suite/indexing/map_indexing_suite.hpp>
#include <sot/core/robot-utils.hh> #include <sot/core/robot-utils.hh>
using namespace boost::python; using namespace boost::python;
using namespace dynamicgraph::sot; using namespace dynamicgraph::sot;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment