From 6a4d821ce75c4651f29e137b257ee75e50fcd9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0=20Ortega?= <jsola@iri.upc.edu>
Date: Fri, 28 Jun 2019 10:03:29 +0200
Subject: [PATCH] Fixes override constraint
---
include/core/processor/processor_motion.h | 2 +-
include/core/processor/processor_tracker.h | 2 +-
src/frame/frame_base.cpp | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/core/processor/processor_motion.h b/include/core/processor/processor_motion.h
index 25f5072ce..15f0ca900 100644
--- a/include/core/processor/processor_motion.h
+++ b/include/core/processor/processor_motion.h
@@ -214,7 +214,7 @@ class ProcessorMotion : public ProcessorBase
*/
FrameBasePtr setOrigin(const Eigen::VectorXs& _x_origin, const TimeStamp& _ts_origin);
- virtual void setProblem(ProblemPtr);
+ virtual void setProblem(ProblemPtr) override;
MotionBuffer& getBuffer();
const MotionBuffer& getBuffer() const;
diff --git a/include/core/processor/processor_tracker.h b/include/core/processor/processor_tracker.h
index 7e701180a..bab37b3a2 100644
--- a/include/core/processor/processor_tracker.h
+++ b/include/core/processor/processor_tracker.h
@@ -200,7 +200,7 @@ class ProcessorTracker : public ProcessorBase
*
* WARNING! This function only votes! It does not create KeyFrames!
*/
- virtual bool voteForKeyFrame() = 0;
+ virtual bool voteForKeyFrame() override = 0;
/** \brief Advance the incoming Capture to become the last.
*
diff --git a/src/frame/frame_base.cpp b/src/frame/frame_base.cpp
index 0bdb038d9..aee1ecfae 100644
--- a/src/frame/frame_base.cpp
+++ b/src/frame/frame_base.cpp
@@ -375,17 +375,17 @@ CaptureBasePtrList FrameBase::getCapturesOf(const SensorBasePtr _sensor_ptr)
FactorBasePtr FrameBase::getFactorOf(const ProcessorBasePtr _processor_ptr, const std::string& type)
{
- for (const FactorBasePtr& constaint_ptr : getConstrainedByList())
- if (constaint_ptr->getProcessor() == _processor_ptr && constaint_ptr->getType() == type)
- return constaint_ptr;
+ for (const FactorBasePtr& factor_ptr : getConstrainedByList())
+ if (factor_ptr->getProcessor() == _processor_ptr && factor_ptr->getType() == type)
+ return factor_ptr;
return nullptr;
}
FactorBasePtr FrameBase::getFactorOf(const ProcessorBasePtr _processor_ptr)
{
- for (const FactorBasePtr& constaint_ptr : getConstrainedByList())
- if (constaint_ptr->getProcessor() == _processor_ptr)
- return constaint_ptr;
+ for (const FactorBasePtr& factor_ptr : getConstrainedByList())
+ if (factor_ptr->getProcessor() == _processor_ptr)
+ return factor_ptr;
return nullptr;
}
--
GitLab