Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/urdf/files/, dev-ros/urdf/
Date: Tue, 27 Jun 2017 10:01:44
Message-Id: 1498557687.6f0405341f1ce0f33a085827bd26965cae25aabb.aballier@gentoo
1 commit: 6f0405341f1ce0f33a085827bd26965cae25aabb
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 27 09:58:54 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 27 10:01:27 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f040534
7
8 dev-ros/urdf: avoid forward declaration of class
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 dev-ros/urdf/files/forward_decl.patch | 17 +++++++++++++++++
13 dev-ros/urdf/urdf-1.12.10.ebuild | 2 ++
14 2 files changed, 19 insertions(+)
15
16 diff --git a/dev-ros/urdf/files/forward_decl.patch b/dev-ros/urdf/files/forward_decl.patch
17 new file mode 100644
18 index 00000000000..8aef13eb92d
19 --- /dev/null
20 +++ b/dev-ros/urdf/files/forward_decl.patch
21 @@ -0,0 +1,17 @@
22 +Index: urdf/urdfdom_compatibility.h.in
23 +===================================================================
24 +--- urdf.orig/urdfdom_compatibility.h.in
25 ++++ urdf/urdfdom_compatibility.h.in
26 +@@ -85,10 +85,12 @@ URDF_TYPEDEF_CLASS_POINTER(Model);
27 + #include <urdf_world/types.h>
28 +
29 + namespace urdf {
30 ++class ModelInterface;
31 + typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr;
32 + typedef std::shared_ptr<const ModelInterface> ModelInterfaceConstSharedPtr;
33 + typedef std::weak_ptr<ModelInterface> ModelInterfaceWeakPtr;
34 +
35 ++class Model;
36 + typedef std::shared_ptr<Model> ModelSharedPtr;
37 + typedef std::shared_ptr<const Model> ModelConstSharedPtr;
38 + typedef std::weak_ptr<Model> ModelWeakPtr;
39
40 diff --git a/dev-ros/urdf/urdf-1.12.10.ebuild b/dev-ros/urdf/urdf-1.12.10.ebuild
41 index 7e228f156c7..260fee45fc0 100644
42 --- a/dev-ros/urdf/urdf-1.12.10.ebuild
43 +++ b/dev-ros/urdf/urdf-1.12.10.ebuild
44 @@ -27,3 +27,5 @@ RDEPEND="
45 DEPEND="${RDEPEND}
46 dev-ros/cmake_modules
47 test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
48 +
49 +PATCHES=( "${FILESDIR}/forward_decl.patch" )