From 822edbc3ed9d85a0e2431190a8ea9a8fa48097b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Fri, 2 Aug 2019 00:45:30 +0200
Subject: [PATCH] Replace sh_ptr reference by simple sh_ptr
---
include/gnss/processor/processor_gnss_fix.h | 2 +-
include/gnss/processor/processor_gnss_single_diff.h | 2 +-
src/processor/processor_gnss_fix.cpp | 6 +++---
src/processor/processor_gnss_single_diff.cpp | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/gnss/processor/processor_gnss_fix.h b/include/gnss/processor/processor_gnss_fix.h
index 07d00f30a..4bd3dfe2e 100644
--- a/include/gnss/processor/processor_gnss_fix.h
+++ b/include/gnss/processor/processor_gnss_fix.h
@@ -92,7 +92,7 @@ class ProcessorGnssFix : public ProcessorBase
virtual bool voteForKeyFrame() override;
private:
- FactorBasePtr emplaceFactor(FeatureBasePtr& ftr_ptr);
+ FactorBasePtr emplaceFactor(FeatureBasePtr _ftr_ptr);
bool rejectOutlier(FactorBasePtr ctr_ptr);
public:
diff --git a/include/gnss/processor/processor_gnss_single_diff.h b/include/gnss/processor/processor_gnss_single_diff.h
index b4a215d79..b425b162d 100644
--- a/include/gnss/processor/processor_gnss_single_diff.h
+++ b/include/gnss/processor/processor_gnss_single_diff.h
@@ -94,7 +94,7 @@ class ProcessorGnssSingleDiff : public ProcessorBase
private:
- FactorBasePtr emplaceFactor(FeatureBasePtr& ftr);
+ FactorBasePtr emplaceFactor(FeatureBasePtr _ftr);
public:
static ProcessorBasePtr create(const std::string& _unique_name, const ProcessorParamsBasePtr _params, const SensorBasePtr sensor);
diff --git a/src/processor/processor_gnss_fix.cpp b/src/processor/processor_gnss_fix.cpp
index 578e0203c..f11be23a5 100644
--- a/src/processor/processor_gnss_fix.cpp
+++ b/src/processor/processor_gnss_fix.cpp
@@ -98,16 +98,16 @@ void ProcessorGnssFix::processCapture(CaptureBasePtr _capture)
}
}
-FactorBasePtr ProcessorGnssFix::emplaceFactor(FeatureBasePtr& ftr)
+FactorBasePtr ProcessorGnssFix::emplaceFactor(FeatureBasePtr _ftr)
{
// CREATE CONSTRAINT --------------------
//WOLF_DEBUG("creating the factor...");
// 2D
if (getProblem()->getDim() == 2)
- return FactorBase::emplace<FactorGnssFix2D>(ftr, ftr, sensor_gnss_, shared_from_this(), false, FAC_ACTIVE);
+ return FactorBase::emplace<FactorGnssFix2D>(_ftr, _ftr, sensor_gnss_, shared_from_this(), false, FAC_ACTIVE);
// 3D
else
- return FactorBase::emplace<FactorGnssFix3D>(ftr, ftr, sensor_gnss_, shared_from_this(), false, FAC_ACTIVE);
+ return FactorBase::emplace<FactorGnssFix3D>(_ftr, _ftr, sensor_gnss_, shared_from_this(), false, FAC_ACTIVE);
}
bool ProcessorGnssFix::rejectOutlier(FactorBasePtr fac)
diff --git a/src/processor/processor_gnss_single_diff.cpp b/src/processor/processor_gnss_single_diff.cpp
index c2bb47b99..3bc0a79c7 100644
--- a/src/processor/processor_gnss_single_diff.cpp
+++ b/src/processor/processor_gnss_single_diff.cpp
@@ -88,12 +88,12 @@ void ProcessorGnssSingleDiff::processCapture(CaptureBasePtr _capture)
}
}
-FactorBasePtr ProcessorGnssSingleDiff::emplaceFactor(FeatureBasePtr& ftr)
+FactorBasePtr ProcessorGnssSingleDiff::emplaceFactor(FeatureBasePtr _ftr)
{
//WOLF_DEBUG("creating the factor...");
// 2D
if (getProblem()->getDim() == 2)
- return FactorBase::emplace<FactorGnssSingleDiff2D>(ftr, ftr, incoming_capture_->getOriginFrame(), sensor_gnss_, shared_from_this());
+ return FactorBase::emplace<FactorGnssSingleDiff2D>(_ftr, _ftr, incoming_capture_->getOriginFrame(), sensor_gnss_, shared_from_this());
// 3D TODO
else
std::runtime_error("Single Differences in 3D not implemented yet.");
--
GitLab