[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51987] trunk/blender/intern/itasc/kdl: itask: reworked conditionals for osx version compatibility

[jens verwiebe]

Revision: 51987
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51987
Author:   jensverwiebe
Date:     2012-11-07 21:19:43 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
itask: reworked conditionals for osx version compatibility

Modified Paths:
--------------
    trunk/blender/intern/itasc/kdl/chain.hpp
    trunk/blender/intern/itasc/kdl/tree.hpp

Modified: trunk/blender/intern/itasc/kdl/chain.hpp
===================================================================
--- trunk/blender/intern/itasc/kdl/chain.hpp	2012-11-07 21:00:49 UTC (rev 51986)
+++ trunk/blender/intern/itasc/kdl/chain.hpp	2012-11-07 21:19:43 UTC (rev 51987)
@@ -35,11 +35,16 @@
      */
     class Chain {
     private:
-#if !defined(__APPLE__)
+#if defined(__APPLE__)
+#  if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
+		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
-        std::vector<Segment> segments;
+        // 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;

Modified: trunk/blender/intern/itasc/kdl/tree.hpp
===================================================================
--- trunk/blender/intern/itasc/kdl/tree.hpp	2012-11-07 21:00:49 UTC (rev 51986)
+++ trunk/blender/intern/itasc/kdl/tree.hpp	2012-11-07 21:19:43 UTC (rev 51987)
@@ -27,19 +27,30 @@
 
 #include <string>
 #include <map>
-#if !defined(__APPLE__)
-#include <Eigen/Core>
+#if defined(__APPLE__)
+#  if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
+    //no include
+#  else
+#    include <Eigen/Core>
+#  endif /* MAC_OS_X_VERSION_MIN_REQUIRED */
+#else
+#  include <Eigen/Core>
 #endif
 
 namespace KDL
 {
     //Forward declaration
     class TreeElement;
-#if !defined(__APPLE__)
+#if defined(__APPLE__)
+#  if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
+    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 /* MAC_OS_X_VERSION_MIN_REQUIRED */
 #else
-    typedef std::map<std::string,TreeElement> SegmentMap;
+    // 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
     {