From bff59a5b2eb9f8fd50df6250f020b46ff71bcdba Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Tue, 15 Nov 2011 21:55:07 +0000 Subject: OSX: buildfix for itask on 10.5.sdk --- intern/itasc/kdl/chain.hpp | 4 ++++ intern/itasc/kdl/tree.hpp | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'intern/itasc') diff --git a/intern/itasc/kdl/chain.hpp b/intern/itasc/kdl/chain.hpp index 81c606b73c0..773f472cc5c 100644 --- a/intern/itasc/kdl/chain.hpp +++ b/intern/itasc/kdl/chain.hpp @@ -35,8 +35,12 @@ namespace KDL { */ class Chain { private: +#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5) // Eigen allocator is needed for alignment of Eigen data types std::vector > segments; +#else + std::vector segments; +#endif unsigned int nrOfJoints; unsigned int nrOfSegments; public: diff --git a/intern/itasc/kdl/tree.hpp b/intern/itasc/kdl/tree.hpp index 6b822dcd1e0..4dfb55c7823 100644 --- a/intern/itasc/kdl/tree.hpp +++ b/intern/itasc/kdl/tree.hpp @@ -27,15 +27,20 @@ #include #include +#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5) #include +#endif namespace KDL { //Forward declaration class TreeElement; +#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5) // Eigen allocator is needed for alignment of Eigen data types typedef std::map, Eigen::aligned_allocator > > SegmentMap; - +#else + typedef std::map SegmentMap; +#endif class TreeElement { private: -- cgit v1.2.3