Unverified Commit a28ec541 authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub

Merge pull request #889 from jcarpent/devel

Fix setting of BOOST_MPL_LIMIT_LIST_SIZE
parents 0f0ed8fb 5c1e80ab
......@@ -170,7 +170,6 @@ ADD_DEFINITIONS(-DBOOST_MPL_LIMIT_VECTOR_SIZE=30)
# Variable containing all the cflags definition relative to optional dependencies
SET(CFLAGS_DEPENDENCIES)
LIST(APPEND CFLAGS_DEPENDENCIES "-DBOOST_MPL_LIMIT_LIST_SIZE=30")
LIST(APPEND CFLAGS_DEPENDENCIES "-DBOOST_MPL_LIMIT_VECTOR_SIZE=30")
# Path to boost headers
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
......
......@@ -5,25 +5,30 @@
#ifndef __pinocchio_container_boost_container_limits_hpp__
#define __pinocchio_container_boost_container_limits_hpp__
#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
#include "pinocchio/macros.hpp"
#define PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE_DEFAULT 30
//#ifndef PINOCCHIO_WITH_CXX11_SUPPORT
#ifndef PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE
#define PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE_DEFAULT
#endif
#define PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE_DEFAULT 30
#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
#ifndef PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE
#define PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE_DEFAULT
#endif
#ifndef BOOST_MPL_LIMIT_LIST_SIZE
#define BOOST_MPL_LIMIT_LIST_SIZE PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE
#endif
#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
#ifndef BOOST_MPL_LIMIT_VECTOR_SIZE
#define BOOST_MPL_LIMIT_VECTOR_SIZE PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE
#endif
#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
#endif // ifndef __pinocchio_container_boost_container_limits_hpp__
#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 // ifndef PINOCCHIO_WITH_CXX11_SUPPORT
#endif // ifndef __pinocchio_container_boost_container_limits_hpp__
Markdown is supported
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