diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2011-11-16 01:55:07 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2011-11-16 01:55:07 +0400 |
| commit | bff59a5b2eb9f8fd50df6250f020b46ff71bcdba (patch) | |
| tree | 7093873be637f9d28a93e4a9059e9ca879c9e1ae /intern/itasc | |
| parent | 8db117a81a00bbd697e4d1a7b7039e67f4c47af6 (diff) | |
OSX: buildfix for itask on 10.5.sdk
Diffstat (limited to 'intern/itasc')
| -rw-r--r-- | intern/itasc/kdl/chain.hpp | 4 | ||||
| -rw-r--r-- | intern/itasc/kdl/tree.hpp | 7 |
2 files changed, 10 insertions, 1 deletions
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<Segment, Eigen::aligned_allocator<Segment> > segments; +#else + std::vector<Segment> 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 <string> #include <map> +#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5) #include <Eigen/Core> +#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<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap; - +#else + typedef std::map<std::string,TreeElement> SegmentMap; +#endif class TreeElement { private: |