diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-27 20:54:14 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-29 02:27:18 +0300 |
| commit | d1a26437ef81d9f5fcf8c2f3ff27ae22e7a970fa (patch) | |
| tree | fe792043bb11637f5fe466ec83735947997974dc /intern/itasc | |
| parent | 6ca6d29e6b9a9f4f02ac48d8c77030f528ef4325 (diff) | |
OS X: remove code for OS X <= 10.5, which is already not supported since 2 years.
Diffstat (limited to 'intern/itasc')
| -rw-r--r-- | intern/itasc/kdl/chain.hpp | 9 | ||||
| -rw-r--r-- | intern/itasc/kdl/tree.hpp | 14 |
2 files changed, 1 insertions, 22 deletions
diff --git a/intern/itasc/kdl/chain.hpp b/intern/itasc/kdl/chain.hpp index 1776737fc7d..81c606b73c0 100644 --- a/intern/itasc/kdl/chain.hpp +++ b/intern/itasc/kdl/chain.hpp @@ -35,17 +35,8 @@ namespace KDL { */ class Chain { private: -#if defined(__APPLE__) -# if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050 - std::vector<Segment> segments; -# else // Eigen allocator is needed for alignment of Eigen data types std::vector<Segment, Eigen::aligned_allocator<Segment> > segments; -# endif /* MAC_OS_X_VERSION_MIN_REQUIRED */ -#else - // Eigen allocator is needed for alignment of Eigen data types - std::vector<Segment, Eigen::aligned_allocator<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 8f971200969..c8a253fc901 100644 --- a/intern/itasc/kdl/tree.hpp +++ b/intern/itasc/kdl/tree.hpp @@ -27,26 +27,14 @@ #include <string> #include <map> -#if defined(__APPLE__) -# if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050 - //no include -# else -# include <Eigen/Core> -# endif /* MAC_OS_X_VERSION_MIN_REQUIRED */ -#else -# include <Eigen/Core> -#endif +#include <Eigen/Core> namespace KDL { //Forward declaration class TreeElement; -#if defined(__APPLE__) && 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 typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap; -#endif class TreeElement { |