[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41896] trunk/blender/intern/itasc/kdl: OSX: buildfix for itask on 10.5.sdk
jens verwiebe
info at jensverwiebe.de
Tue Nov 15 22:55:07 CET 2011
Revision: 41896
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41896
Author: jensverwiebe
Date: 2011-11-15 21:55:07 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
OSX: buildfix for itask on 10.5.sdk
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 2011-11-15 21:16:37 UTC (rev 41895)
+++ trunk/blender/intern/itasc/kdl/chain.hpp 2011-11-15 21:55:07 UTC (rev 41896)
@@ -35,8 +35,12 @@
*/
class Chain {
private:
+#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5)
// Eigen allocator is needed for alignment of Eigen data types
std::vector<Segment, Eigen::aligned_allocator<Segment> > segments;
+#else
+ std::vector<Segment> segments;
+#endif
unsigned int nrOfJoints;
unsigned int nrOfSegments;
public:
Modified: trunk/blender/intern/itasc/kdl/tree.hpp
===================================================================
--- trunk/blender/intern/itasc/kdl/tree.hpp 2011-11-15 21:16:37 UTC (rev 41895)
+++ trunk/blender/intern/itasc/kdl/tree.hpp 2011-11-15 21:55:07 UTC (rev 41896)
@@ -27,15 +27,20 @@
#include <string>
#include <map>
+#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5)
#include <Eigen/Core>
+#endif
namespace KDL
{
//Forward declaration
class TreeElement;
+#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5)
// 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
+ typedef std::map<std::string,TreeElement> SegmentMap;
+#endif
class TreeElement
{
private:
More information about the Bf-blender-cvs
mailing list