Skip to content
GitLab
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
4509dbdd
Unverified
Commit
4509dbdd
authored
May 22, 2021
by
Justin Carpentier
Committed by
GitHub
May 22, 2021
Browse files
Merge pull request #1452 from jcarpent/topic/boost
Enforce BOOST_MPL_LIMIT_LIST_SIZE
parents
9e5a6218
15b0f14e
Pipeline
#14655
passed with stage
in 144 minutes and 5 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.github/workflows/macos-linux-conda.yml
View file @
4509dbdd
...
@@ -31,7 +31,7 @@ jobs:
...
@@ -31,7 +31,7 @@ jobs:
run
:
|
run
:
|
conda activate pinocchio
conda activate pinocchio
conda install cmake -c main
conda install cmake -c main
conda install llvm-openmp -c conda-forge
conda install llvm-openmp
libcxx=11
-c conda-forge
-
name
:
Build Pinocchio
-
name
:
Build Pinocchio
shell
:
bash -l {0}
shell
:
bash -l {0}
...
...
CMakeLists.txt
View file @
4509dbdd
...
@@ -181,14 +181,6 @@ IF(BUILD_WITH_HPP_FCL_SUPPORT)
...
@@ -181,14 +181,6 @@ IF(BUILD_WITH_HPP_FCL_SUPPORT)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
ENDIF
(
BUILD_WITH_HPP_FCL_SUPPORT
)
ENDIF
(
BUILD_WITH_HPP_FCL_SUPPORT
)
# Enforce the preprocessed version of boost::list and boost::vector
# This information is redundant with the content of include/pinocchio/container/boost-container-limits.hpp
# but it avoids any compilation issue.
ADD_DEFINITIONS
(
-DBOOST_MPL_LIMIT_LIST_SIZE=30
)
ADD_DEFINITIONS
(
-DBOOST_MPL_LIMIT_VECTOR_SIZE=30
)
LIST
(
APPEND CFLAGS_DEPENDENCIES
"-DBOOST_MPL_LIMIT_LIST_SIZE=30"
)
# Path to boost headers
# Path to boost headers
INCLUDE_DIRECTORIES
(
SYSTEM
${
Boost_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
SYSTEM
${
Boost_INCLUDE_DIRS
}
)
...
...
bindings/python/math/expose-rpy.cpp
View file @
4509dbdd
//
//
// Copyright (c) 2019-202
0
CNRS INRIA
// Copyright (c) 2019-202
1
CNRS INRIA
//
//
#include
<boost/python.hpp>
#include
"pinocchio/bindings/python/fwd.hpp"
#include
"pinocchio/bindings/python/fwd.hpp"
#include
"pinocchio/bindings/python/utils/namespace.hpp"
#include
"pinocchio/bindings/python/utils/namespace.hpp"
#include
"pinocchio/math/rpy.hpp"
#include
"pinocchio/math/rpy.hpp"
...
...
bindings/python/spatial/expose-skew.cpp
View file @
4509dbdd
//
//
// Copyright (c) 2015-202
0
CNRS INRIA
// Copyright (c) 2015-202
1
CNRS INRIA
// Copyright (c) 2020 Wandercraft
// Copyright (c) 2020 Wandercraft
//
//
#include
<boost/python.hpp>
#include
"pinocchio/bindings/python/fwd.hpp"
#include
"pinocchio/bindings/python/fwd.hpp"
#include
"pinocchio/spatial/se3.hpp"
#include
"pinocchio/spatial/se3.hpp"
#include
"pinocchio/spatial/skew.hpp"
#include
"pinocchio/spatial/skew.hpp"
...
...
src/container/boost-container-limits.hpp
View file @
4509dbdd
//
//
// Copyright (c) 2019 INRIA
// Copyright (c) 2019
-2021
INRIA
//
//
#ifndef __pinocchio_container_boost_container_limits_hpp__
#ifndef __pinocchio_container_boost_container_limits_hpp__
...
@@ -20,13 +20,18 @@
...
@@ -20,13 +20,18 @@
#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
#if !defined(BOOST_MPL_LIMIT_LIST_SIZE)
// Check the inclusion order
// Check the inclusion order
#if defined(BOOST_MPL_LIST_HPP_INCLUDED)
#if defined(BOOST_MPL_LIST_HPP_INCLUDED)
# error "You should include pinocchio before
boost
(e.g. #include <pinocchio/fwd.hpp>)"
# error "You should include pinocchio before
the Boost headers
(e.g. #include <pinocchio/fwd.hpp>)"
#endif
#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
#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"
#if defined(BOOST_MPL_LIST_HPP_INCLUDED)
# error "You should include pinocchio before the Boost headers (e.g. #include <pinocchio/fwd.hpp>)"
#else
# error "BOOST_MPL_LIMIT_LIST_SIZE value is lower than the value of PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE"
#endif
#endif
#endif
//#endif // ifndef PINOCCHIO_WITH_CXX11_SUPPORT
//#endif // ifndef PINOCCHIO_WITH_CXX11_SUPPORT
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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