1 |
commit: 6b50ed651a950ced26bd0efa7559555ea6e33416 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 2 10:19:06 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 2 10:19:14 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b50ed65 |
7 |
|
8 |
dev-ros/hector_pose_estimation_core: fix build with gcc6, bug #598114 |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
.../hector_pose_estimation_core/files/gcc6.patch | 35 ++++++++++++++++++++++ |
13 |
.../hector_pose_estimation_core-0.3.0-r1.ebuild | 2 +- |
14 |
2 files changed, 36 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/dev-ros/hector_pose_estimation_core/files/gcc6.patch b/dev-ros/hector_pose_estimation_core/files/gcc6.patch |
17 |
new file mode 100644 |
18 |
index 00000000..4286291 |
19 |
--- /dev/null |
20 |
+++ b/dev-ros/hector_pose_estimation_core/files/gcc6.patch |
21 |
@@ -0,0 +1,35 @@ |
22 |
+Index: hector_pose_estimation_core/include/hector_pose_estimation/input.h |
23 |
+=================================================================== |
24 |
+--- hector_pose_estimation_core.orig/include/hector_pose_estimation/input.h |
25 |
++++ hector_pose_estimation_core/include/hector_pose_estimation/input.h |
26 |
+@@ -79,7 +79,7 @@ public: |
27 |
+ return *variance_; |
28 |
+ } |
29 |
+ |
30 |
+- virtual bool hasVariance() const { return variance_; } |
31 |
++ virtual bool hasVariance() const { return variance_ != NULL; } |
32 |
+ virtual Variance const &getVariance() { if (!variance_) variance_.reset(new Variance); return *variance_; } |
33 |
+ virtual Variance const &getVariance() const { return *variance_; } |
34 |
+ virtual Variance& variance() { if (!variance_) variance_.reset(new Variance); return *variance_; } |
35 |
+Index: hector_pose_estimation_core/src/system/imu_model.cpp |
36 |
+=================================================================== |
37 |
+--- hector_pose_estimation_core.orig/src/system/imu_model.cpp |
38 |
++++ hector_pose_estimation_core/src/system/imu_model.cpp |
39 |
+@@ -51,7 +51,7 @@ GyroModel::~GyroModel() |
40 |
+ bool GyroModel::init(PoseEstimation& estimator, System &system, State& state) |
41 |
+ { |
42 |
+ bias_ = state.addSubState<3,3>(this, system.getName() + "_bias"); |
43 |
+- return bias_; |
44 |
++ return bias_ != NULL; |
45 |
+ } |
46 |
+ |
47 |
+ void GyroModel::getPrior(State &state) |
48 |
+@@ -113,7 +113,7 @@ AccelerometerModel::~AccelerometerModel( |
49 |
+ bool AccelerometerModel::init(PoseEstimation& estimator, System &system, State& state) |
50 |
+ { |
51 |
+ bias_ = state.addSubState<3,3>(this, system.getName() + "_bias"); |
52 |
+- return bias_; |
53 |
++ return bias_ != NULL; |
54 |
+ } |
55 |
+ |
56 |
+ void AccelerometerModel::getPrior(State &state) |
57 |
|
58 |
diff --git a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild |
59 |
index 3fce19f..63064ba 100644 |
60 |
--- a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild |
61 |
+++ b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild |
62 |
@@ -27,4 +27,4 @@ RDEPEND=" |
63 |
" |
64 |
DEPEND="${RDEPEND} |
65 |
dev-cpp/eigen:3" |
66 |
-PATCHES=( "${FILESDIR}/includes.patch" ) |
67 |
+PATCHES=( "${FILESDIR}/includes.patch" "${FILESDIR}/gcc6.patch" ) |