diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-07 15:57:51 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-07 15:57:51 +0400 |
| commit | d7fe02936be2b85741652d4180accb3775c45e8e (patch) | |
| tree | affc04bafef863c4c10991ab4bdc8b77c4018d5c /intern/itasc | |
| parent | fff3f9576850ddd24f128be7e63fb58a06c11564 (diff) | |
Fix ITASK warnings
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 bc9061e232f..24e40858bff 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__) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 +#if !defined(__APPLE__) // 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 afa56c820d9..4da764ac6d6 100644 --- a/intern/itasc/kdl/tree.hpp +++ b/intern/itasc/kdl/tree.hpp @@ -27,7 +27,7 @@ #include <string> #include <map> -#if !defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 +#if !defined(__APPLE__) #include <Eigen/Core> #endif @@ -35,7 +35,7 @@ namespace KDL { //Forward declaration class TreeElement; -#if !defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 +#if !defined(__APPLE__) // 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 |