[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51977] trunk/blender/intern/itasc/kdl: Fix ITASK warnings
jens verwiebe
info at jensverwiebe.de
Wed Nov 7 12:57:56 CET 2012
Revision: 51977
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51977
Author: jensverwiebe
Date: 2012-11-07 11:57:51 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Fix ITASK warnings
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 11:44:39 UTC (rev 51976)
+++ trunk/blender/intern/itasc/kdl/chain.hpp 2012-11-07 11:57:51 UTC (rev 51977)
@@ -35,7 +35,7 @@
*/
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
Modified: trunk/blender/intern/itasc/kdl/tree.hpp
===================================================================
--- trunk/blender/intern/itasc/kdl/tree.hpp 2012-11-07 11:44:39 UTC (rev 51976)
+++ trunk/blender/intern/itasc/kdl/tree.hpp 2012-11-07 11:57:51 UTC (rev 51977)
@@ -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 @@
{
//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
More information about the Bf-blender-cvs
mailing list