Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OS X: remove code for OS X <= 10.5, which is already not supported since 2 years.

Browse Source
This commit is contained in:
Brecht Van Lommel
2015-12-27 18:54:14 +01:00
parent 6ca6d29e6b
commit d1a26437ef
7 changed files with 4 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/itasc/kdl/chain.hpp
View File

@@ -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:

14
intern/itasc/kdl/tree.hpp
View File

@@ -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
{