From 7b97ac520a9695b2ed28f2ea49b22cd8358f624d Mon Sep 17 00:00:00 2001
From: Jeremie Deray <jeremie.deray@pal-robotics.com>
Date: Tue, 25 Oct 2016 16:16:54 +0200
Subject: [PATCH] fix error type qualifiers ignored on function return type
[-Werror=ignored-qualifiers]
---
src/landmark_base.h | 4 ++--
src/processor_motion.h | 8 ++++----
src/processor_tracker.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/landmark_base.h b/src/landmark_base.h
index f861fef29..328ca267b 100644
--- a/src/landmark_base.h
+++ b/src/landmark_base.h
@@ -61,7 +61,7 @@ class LandmarkBase : public NodeBase, public std::enable_shared_from_this<Landma
// Properties
unsigned int id();
void setId(unsigned int _id);
- const LandmarkType getTypeId() const;
+ LandmarkType getTypeId() const;
// Fix / unfix
void setStatus(LandmarkStatus _st);
@@ -240,7 +240,7 @@ inline const Eigen::VectorXs& LandmarkBase::getDescriptor() const
return descriptor_;
}
-inline const LandmarkType LandmarkBase::getTypeId() const
+inline LandmarkType LandmarkBase::getTypeId() const
{
return type_id_;
}
diff --git a/src/processor_motion.h b/src/processor_motion.h
index 21854c848..7f06324fd 100644
--- a/src/processor_motion.h
+++ b/src/processor_motion.h
@@ -100,13 +100,13 @@ class ProcessorMotion : public ProcessorBase
/** \brief Fills a reference to the state integrated so far
* \param _x the returned state vector
*/
- const void getCurrentState(Eigen::VectorXs& _x);
+ void getCurrentState(Eigen::VectorXs& _x);
/** \brief Fills a reference to the state integrated so far and its stamp
* \param _x the returned state vector
* \param _ts the returned stamp
*/
- const void getCurrentState(Eigen::VectorXs& _x, TimeStamp& _ts);
+ void getCurrentState(Eigen::VectorXs& _x, TimeStamp& _ts);
/** \brief Gets a constant reference to the state integrated so far
* \return the state vector
@@ -700,13 +700,13 @@ inline const Eigen::VectorXs& ProcessorMotion::getCurrentState(TimeStamp& _ts)
return x_;
}
-inline const void ProcessorMotion::getCurrentState(Eigen::VectorXs& _x)
+inline void ProcessorMotion::getCurrentState(Eigen::VectorXs& _x)
{
Scalar Dt = getBuffer().get().back().ts_ - origin_ptr_->getTimeStamp();
xPlusDelta(origin_ptr_->getFramePtr()->getState(), getBuffer().get().back().delta_integr_, Dt, _x);
}
-inline const void ProcessorMotion::getCurrentState(Eigen::VectorXs& _x, TimeStamp& _ts)
+inline void ProcessorMotion::getCurrentState(Eigen::VectorXs& _x, TimeStamp& _ts)
{
getCurrentState(_x);
_ts = getBuffer().get().back().ts_;
diff --git a/src/processor_tracker.h b/src/processor_tracker.h
index 8f27821c0..5a47b3588 100644
--- a/src/processor_tracker.h
+++ b/src/processor_tracker.h
@@ -85,7 +85,7 @@ class ProcessorTracker : public ProcessorBase
virtual void process(CaptureBasePtr const _incoming_ptr);
void setMaxNewFeatures(const unsigned int& _max_new_features);
- const unsigned int getMaxNewFeatures();
+ unsigned int getMaxNewFeatures();
virtual bool keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other);
@@ -195,7 +195,7 @@ inline void ProcessorTracker::setMaxNewFeatures(const unsigned int& _max_new_fea
max_new_features_ = _max_new_features;
}
-inline const unsigned int ProcessorTracker::getMaxNewFeatures()
+inline unsigned int ProcessorTracker::getMaxNewFeatures()
{
return max_new_features_;
}
--
GitLab