diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-08 01:19:43 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-08 01:19:43 +0400 |
commit | aa42934cef8a5f545518bbfe3d7ddf4825818b3b (patch) | |
tree | 67ed34fc4bebc1267a3daeea0cc47adfa94036c3 /intern/itasc/kdl/chain.hpp | |
parent | 204113b791a8eea6087de61199df1d5811055244 (diff) |
itask: reworked conditionals for osx version compatibility
Diffstat (limited to 'intern/itasc/kdl/chain.hpp')
-rw-r--r-- | intern/itasc/kdl/chain.hpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/itasc/kdl/chain.hpp b/intern/itasc/kdl/chain.hpp index 24e40858bff..fde9d4ed23e 100644 --- a/intern/itasc/kdl/chain.hpp +++ b/intern/itasc/kdl/chain.hpp @@ -35,11 +35,16 @@ namespace KDL { */ class Chain { private: -#if !defined(__APPLE__) +#if defined(__APPLE__) +# if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5 + std::vector<Segment> segments; +# else // Eigen allocator is needed for alignment of Eigen data types std::vector<Segment, Eigen::aligned_allocator<Segment> > segments; +# endif /* MAC_OS_X_VERSION_MIN_REQUIRED */ #else - std::vector<Segment> segments; + // Eigen allocator is needed for alignment of Eigen data types + std::vector<Segment, Eigen::aligned_allocator<Segment> > segments; #endif unsigned int nrOfJoints; unsigned int nrOfSegments; |