diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-06 19:19:49 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-06 19:19:49 +0400 |
| commit | acc8c654fc83373b3ef98247cd3c2a1e1d23a168 (patch) | |
| tree | b5f6b7aedc067f4dee6aec8d4164e8b19a408a21 /intern/itasc | |
| parent | 41bfb62b0fd72ebd0f3031a261711a00d5e8221b (diff) | |
OSX: substitute all MAC_OS_X_VERSION defines with MAC_OS_X_VERSION_MIN_REQUIRED macros, to get more reliable version (api) covering
Diffstat (limited to 'intern/itasc')
| -rw-r--r-- | intern/itasc/kdl/chain.hpp | 2 | ||||
| -rw-r--r-- | intern/itasc/kdl/tree.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/itasc/kdl/chain.hpp b/intern/itasc/kdl/chain.hpp index 773f472cc5c..bc9061e232f 100644 --- a/intern/itasc/kdl/chain.hpp +++ b/intern/itasc/kdl/chain.hpp @@ -35,7 +35,7 @@ namespace KDL { */ class Chain { private: -#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5) +#if !defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 // Eigen allocator is needed for alignment of Eigen data types std::vector<Segment, Eigen::aligned_allocator<Segment> > segments; #else diff --git a/intern/itasc/kdl/tree.hpp b/intern/itasc/kdl/tree.hpp index 08c1aadc6de..afa56c820d9 100644 --- a/intern/itasc/kdl/tree.hpp +++ b/intern/itasc/kdl/tree.hpp @@ -27,7 +27,7 @@ #include <string> #include <map> -#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5) +#if !defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 #include <Eigen/Core> #endif @@ -35,7 +35,7 @@ namespace KDL { //Forward declaration class TreeElement; -#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5) +#if !defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 // 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 |