diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-12-15 15:15:05 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-12-15 15:15:05 +0400 |
| commit | f98c2c936ca3637c634f0adef605602fe07d0b55 (patch) | |
| tree | 20c75e7e49cce03a2520561a721db004033bd177 /intern/itasc | |
| parent | 11f2348383d3b8cde70506f8b013433b610c5d62 (diff) | |
OSX/availability: use of the numerical value instead of the symbol in the #if MAC_OS_X_VERSION_MIN_REQUIRED comparison clause: If the code is loaded on an older system that does not include the symbol definition, the comparison still works
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 fde9d4ed23e..1776737fc7d 100644 --- a/intern/itasc/kdl/chain.hpp +++ b/intern/itasc/kdl/chain.hpp @@ -36,7 +36,7 @@ namespace KDL { class Chain { private: #if defined(__APPLE__) -# if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5 +# if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050 std::vector<Segment> segments; # else // Eigen allocator is needed for alignment of Eigen data types diff --git a/intern/itasc/kdl/tree.hpp b/intern/itasc/kdl/tree.hpp index a020c6cf2cf..82794f96b94 100644 --- a/intern/itasc/kdl/tree.hpp +++ b/intern/itasc/kdl/tree.hpp @@ -28,7 +28,7 @@ #include <string> #include <map> #if defined(__APPLE__) -# if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5 +# if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050 //no include # else # include <Eigen/Core> @@ -42,7 +42,7 @@ namespace KDL //Forward declaration class TreeElement; #if defined(__APPLE__) -# if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5 +# if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050 typedef std::map<std::string,TreeElement> SegmentMap; # else // Eigen allocator is needed for alignment of Eigen data types |