Skip to content

Commit ce0a6ac

Browse files
authored
Merge branch 'devel' into register
2 parents d315e61 + 6c8b80a commit ce0a6ac

File tree

7 files changed

+4
-27
lines changed

7 files changed

+4
-27
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1818
- Fix mjcf parsing of keyframe qpos with newlines ([#2535](https://github.com/stack-of-tasks/pinocchio/pull/2535))
1919
- Fix sites parsing for MJCF format ([#2548](https://github.com/stack-of-tasks/pinocchio/pull/2548))
2020
- Fix register `std::shared_ptr<{,Geometry}{Model,Data}>` in bindings ([#2566](https://github.com/stack-of-tasks/pinocchio/pull/2566))
21+
- Removed useless uses of `PINOCCHIO_WITH_CXX11_SUPPORT` ([#2564](https://github.com/stack-of-tasks/pinocchio/pull/2564))
2122

2223

2324
## [3.3.1] - 2024-12-13

include/pinocchio/bindings/python/fwd.hpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@
99
#include "pinocchio/bindings/python/context.hpp"
1010
#include <eigenpy/eigenpy.hpp>
1111

12-
#ifdef PINOCCHIO_WITH_CXX11_SUPPORT
13-
#include <memory>
14-
#define PINOCCHIO_SHARED_PTR_HOLDER_TYPE(T) ::std::shared_ptr<T>
15-
#else
16-
#include <boost/shared_ptr.hpp>
17-
#define PINOCCHIO_SHARED_PTR_HOLDER_TYPE(T) ::boost::shared_ptr<T>
18-
#endif
12+
#include <memory>
13+
#define PINOCCHIO_SHARED_PTR_HOLDER_TYPE(T) ::std::shared_ptr<T>
1914

2015
namespace pinocchio
2116
{

include/pinocchio/codegen/cppadcg.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515

1616
#include "pinocchio/autodiff/cppad.hpp"
1717

18-
#ifndef PINOCCHIO_WITH_CXX11_SUPPORT
19-
#error CppADCodeGen requires C++11 or more
20-
#endif
21-
2218
namespace boost
2319
{
2420
namespace math

include/pinocchio/container/boost-container-limits.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#include "pinocchio/macros.hpp"
99

10-
// #ifndef PINOCCHIO_WITH_CXX11_SUPPORT
11-
1210
#define PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE_DEFAULT 30
1311

1412
#ifndef PINOCCHIO_BOOST_MPL_LIMIT_CONTAINER_SIZE
@@ -37,6 +35,4 @@
3735

3836
#endif
3937

40-
// #endif // ifndef PINOCCHIO_WITH_CXX11_SUPPORT
41-
4238
#endif // ifndef __pinocchio_container_boost_container_limits_hpp__

include/pinocchio/eigen-macros.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#define PINOCCHIO_EIGEN_CONST_CAST(TYPE, OBJ) const_cast<TYPE &>(OBJ.derived())
5252

5353
///  \brief Tell if Pinocchio should use the Eigen Tensor Module or not
54-
#if defined(PINOCCHIO_WITH_CXX11_SUPPORT) && EIGEN_VERSION_AT_LEAST(3, 2, 90)
54+
#if EIGEN_VERSION_AT_LEAST(3, 2, 90)
5555
#define PINOCCHIO_WITH_EIGEN_TENSOR_MODULE
5656
#endif
5757

include/pinocchio/math/multiprecision.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77

88
#include "pinocchio/math/fwd.hpp"
99

10-
#ifndef PINOCCHIO_WITH_CXX11_SUPPORT
11-
#error C++11 compiler required.
12-
#endif
13-
1410
#include <boost/multiprecision/number.hpp>
1511
#include <boost/random.hpp>
1612
#include <Eigen/Dense>

include/pinocchio/multibody/liegroup/liegroup-base.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,7 @@
1111

1212
namespace pinocchio
1313
{
14-
#ifdef PINOCCHIO_WITH_CXX11_SUPPORT
1514
constexpr int SELF = 0;
16-
#else
17-
enum
18-
{
19-
SELF = 0
20-
};
21-
#endif
2215

2316
#define PINOCCHIO_LIE_GROUP_PUBLIC_INTERFACE_GENERIC(Derived, TYPENAME) \
2417
typedef LieGroupBase<Derived> Base; \

0 commit comments

Comments
 (0)