Skip to content
Snippets Groups Projects
Commit 13369a90 authored by Simon Ottenhaus's avatar Simon Ottenhaus
Browse files

Merge branch 'master' into 'master'

Fixed wrong type on Eigen::aligned_allocator. Allows compilation under macOS clang.

See merge request Simox/simox!26
parents 1bea0574 b6f4ece7
No related branches found
No related tags found
No related merge requests found
......@@ -352,7 +352,7 @@ namespace VirtualRobot
typedef std::map < RobotNodePtr,
Eigen::Matrix4f,
std::less<RobotNodePtr>,
Eigen::aligned_allocator<std::pair<const int, Eigen::Matrix4f> > >
Eigen::aligned_allocator<std::pair<const RobotNodePtr, Eigen::Matrix4f> > >
NodeTransformationMapT;
NodeTransformationMapT localTransformations;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment