p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moveit-core: fix build with gcc8 

http://errors.yoctoproject.org/Errors/Details/178616/

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
[lukas.bulwahn@gmail.com: adjusted patch filename and included Upstream-Status]
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
This commit is contained in:
Martin Jansa 2018-05-15 00:10:04 +00:00 committed by Lukas Bulwahn
parent 41178258b5
commit 8fcd5838a4
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
recipes-ros/moveit/moveit-core/0001-Fix-allocator-type-to-pass-GCC8-static-assert.-888.patch Normal file
View File

@ -0,0 +1,32 @@
From 89a976959e6a84b363ea2c5e53685b2e2b810711 Mon Sep 17 00:00:00 2001
From: Maarten de Vries <maarten@de-vri.es>
Date: Fri, 11 May 2018 07:55:17 +0200
Subject: [PATCH] Fix allocator type to pass GCC8 static assert. (#888)
Upstream-Status: Backport [from kinetic, https://github.com/ros-planning/moveit/commit/89a976959e6a84b363ea2c5e53685b2e2b810711]
This patch has been generated with:
`git format-patch -1 89a976959e6a84b363ea2c5e53685b2e2b810711`
in the moveit repository.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
moveit_core/robot_model/include/moveit/robot_model/link_model.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/moveit_core/robot_model/include/moveit/robot_model/link_model.h b/moveit_core/robot_model/include/moveit/robot_model/link_model.h
index d8aec2f..3f2b1b6 100644
--- a/moveit_core/robot_model/include/moveit/robot_model/link_model.h
+++ b/moveit_core/robot_model/include/moveit/robot_model/link_model.h
@@ -65,7 +65,7 @@ typedef std::map<std::string, const LinkModel*> LinkModelMapConst;
/** \brief Map from link model instances to Eigen transforms */
typedef std::map<const LinkModel*, Eigen::Affine3d, std::less<const LinkModel*>,
- Eigen::aligned_allocator<std::pair<const LinkModel*, Eigen::Affine3d> > >
+ Eigen::aligned_allocator<std::pair<const LinkModel* const, Eigen::Affine3d> > >
LinkTransformMap;
/** \brief A link from the robot. Contains the constant transform applied to the link and its geometry */
--
2.7.4

2
recipes-ros/moveit/moveit-core_0.7.13.bb
View File

@ -6,3 +6,5 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de
DEPENDS = "roslib boost eigen-conversions fcl octomap eigen-stl-containers geometric-shapes kdl-parser moveit-msgs srdfdom cmake-modules" DEPENDS = "roslib boost eigen-conversions fcl octomap eigen-stl-containers geometric-shapes kdl-parser moveit-msgs srdfdom cmake-modules"
require moveit.inc require moveit.inc
SRC_URI += "file://0001-Fix-allocator-type-to-pass-GCC8-static-assert.-888.patch;patchdir=.."