Attachment 170452 Details for Bug 209614 – Fix std::map declaration in graphics/blender

[patch] Fix std::map declaration in graphics/blender

graphics__blender-fix-map-1.diff (text/plain), 1.24 KB, created by Dimitry Andric on 2016-05-18 17:24:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2016-05-18 17:24:13 UTC

Size: 1.24 KB

patch

obsolete

>Index: graphics/blender/files/patch-intern_itasc_kdl_tree.hpp
>===================================================================
>--- graphics/blender/files/patch-intern_itasc_kdl_tree.hpp	(nonexistent)
>+++ graphics/blender/files/patch-intern_itasc_kdl_tree.hpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- intern/itasc/kdl/tree.hpp.orig	2015-10-23 19:02:52 UTC
>++++ intern/itasc/kdl/tree.hpp
>+@@ -45,7 +45,7 @@ namespace KDL
>+     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;
>++    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
>+ #endif
>+ 
>+     class TreeElement
>
>Property changes on: graphics/blender/files/patch-intern_itasc_kdl_tree.hpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 209614: 170452