gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-ros/hector_pose_estimation_core: fix build with gcc6, bug #598114

Browse Source 
Package-Manager: portage-2.3.2
This commit is contained in:
Alexis Ballier
2016-11-02 11:19:06 +01:00
parent 70e557863e
commit 6b50ed651a
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
dev-ros/hector_pose_estimation_core/files/gcc6.patch Normal file
View File

@@ -0,0 +1,35 @@
Index: hector_pose_estimation_core/include/hector_pose_estimation/input.h
===================================================================
--- hector_pose_estimation_core.orig/include/hector_pose_estimation/input.h
+++ hector_pose_estimation_core/include/hector_pose_estimation/input.h
@@ -79,7 +79,7 @@ public:
return *variance_;
}
- virtual bool hasVariance() const { return variance_; }
+ virtual bool hasVariance() const { return variance_ != NULL; }
virtual Variance const &getVariance() { if (!variance_) variance_.reset(new Variance); return *variance_; }
virtual Variance const &getVariance() const { return *variance_; }
virtual Variance& variance() { if (!variance_) variance_.reset(new Variance); return *variance_; }
Index: hector_pose_estimation_core/src/system/imu_model.cpp
===================================================================
--- hector_pose_estimation_core.orig/src/system/imu_model.cpp
+++ hector_pose_estimation_core/src/system/imu_model.cpp
@@ -51,7 +51,7 @@ GyroModel::~GyroModel()
bool GyroModel::init(PoseEstimation& estimator, System &system, State& state)
{
bias_ = state.addSubState<3,3>(this, system.getName() + "_bias");
- return bias_;
+ return bias_ != NULL;
}
void GyroModel::getPrior(State &state)
@@ -113,7 +113,7 @@ AccelerometerModel::~AccelerometerModel(
bool AccelerometerModel::init(PoseEstimation& estimator, System &system, State& state)
{
bias_ = state.addSubState<3,3>(this, system.getName() + "_bias");
- return bias_;
+ return bias_ != NULL;
}
void AccelerometerModel::getPrior(State &state)

2
dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
View File

@@ -27,4 +27,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-cpp/eigen:3"
PATCHES=( "${FILESDIR}/includes.patch" )
PATCHES=( "${FILESDIR}/includes.patch" "${FILESDIR}/gcc6.patch" )