kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OSX: buildfix for itask on 10.5.sdk

Browse Source
This commit is contained in:
Jens Verwiebe 2011-11-15 21:55:07 +00:00
parent 8db117a81a
commit bff59a5b2e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,8 +35,12 @@ namespace KDL {
*/ */
class Chain { class Chain {
private: private:
#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5)
// Eigen allocator is needed for alignment of Eigen data types // Eigen allocator is needed for alignment of Eigen data types
std::vector<Segment, Eigen::aligned_allocator<Segment> > segments; std::vector<Segment, Eigen::aligned_allocator<Segment> > segments;
#else
std::vector<Segment> segments;
#endif
unsigned int nrOfJoints; unsigned int nrOfJoints;
unsigned int nrOfSegments; unsigned int nrOfSegments;
public: public:

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

@ -27,15 +27,20 @@
#include <string> #include <string>
#include <map> #include <map>
#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5)
#include <Eigen/Core> #include <Eigen/Core>
#endif
namespace KDL namespace KDL
{ {
//Forward declaration //Forward declaration
class TreeElement; class TreeElement;
#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5)
// Eigen allocator is needed for alignment of Eigen data types // 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; 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 class TreeElement
{ {
private: private: