Verified Commit 910c1eb3 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

core/boost: do not throw error if BOOST_MPL_LIMIT_LIST_SIZE is defined

parent fa0765a5
...@@ -8,9 +8,6 @@ ...@@ -8,9 +8,6 @@
#include "pinocchio/macros.hpp" #include "pinocchio/macros.hpp"
#ifndef PINOCCHIO_WITH_CXX11_SUPPORT #ifndef PINOCCHIO_WITH_CXX11_SUPPORT
#if defined(BOOST_MPL_LIST_HPP_INCLUDED) || defined(BOOST_MPL_VECTOR_HPP_INCLUDED)
# error "You should include pinocchio before boost (e.g. #include <pinocchio/fwd.hpp>)"
#endif
#define PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE_DEFAULT 30 #define PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE_DEFAULT 30
...@@ -20,9 +17,18 @@ ...@@ -20,9 +17,18 @@
#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS #define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
#ifndef BOOST_MPL_LIMIT_LIST_SIZE #if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
// Check the inclusion order
#if defined(BOOST_MPL_LIST_HPP_INCLUDED)
# error "You should include pinocchio before boost (e.g. #include <pinocchio/fwd.hpp>)"
#endif
#define BOOST_MPL_LIMIT_LIST_SIZE PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE #define BOOST_MPL_LIMIT_LIST_SIZE PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE
#elif BOOST_MPL_LIMIT_LIST_SIZE < PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE
# error "BOOST_MPL_LIMIT_LIST_SIZE value is lower than the value of PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE"
#endif #endif
#endif // ifndef PINOCCHIO_WITH_CXX11_SUPPORT #endif // ifndef PINOCCHIO_WITH_CXX11_SUPPORT
#endif // ifndef __pinocchio_container_boost_container_limits_hpp__ #endif // ifndef __pinocchio_container_boost_container_limits_hpp__
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