Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
pinocchio
Commits
a28ec541
Unverified
Commit
a28ec541
authored
Sep 24, 2019
by
Justin Carpentier
Committed by
GitHub
Sep 24, 2019
Browse files
Merge pull request #889 from jcarpent/devel
Fix setting of BOOST_MPL_LIMIT_LIST_SIZE
parents
0f0ed8fb
5c1e80ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
a28ec541
...
...
@@ -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
}
)
...
...
src/container/boost-container-limits.hpp
View file @
a28ec541
...
...
@@ -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_LIM
IT_C
ONTAINER_SIZE_DEFAULT 30
//#ifndef
PINOCCHIO_
W
IT
H
_C
XX11_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__
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment