From ef6a3b17e40e2374131731a4f41ac00df1fba4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Wed, 10 Jun 2020 15:01:03 +0200
Subject: [PATCH] Remove get() from calls to Factories
---
src/landmark/landmark_polyline_2d.cpp | 2 +-
src/yaml/processor_odom_icp_yaml.cpp | 2 +-
src/yaml/sensor_laser_2d_yaml.cpp | 2 +-
test/gtest_processor_odom_icp.cpp | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/landmark/landmark_polyline_2d.cpp b/src/landmark/landmark_polyline_2d.cpp
index 6447961ac..29d9041d3 100644
--- a/src/landmark/landmark_polyline_2d.cpp
+++ b/src/landmark/landmark_polyline_2d.cpp
@@ -1077,7 +1077,7 @@ void LandmarkPolyline2d::tryMergeLandmarks(LandmarkPolyline2dPtrList& _lmk_list,
// Register landmark creator
namespace
{
-const bool WOLF_UNUSED registered_lmk_polyline_2d = FactoryLandmark::get().registerCreator("LandmarkPolyline2d", LandmarkPolyline2d::create);
+const bool WOLF_UNUSED registered_lmk_polyline_2d = FactoryLandmark::registerCreator("LandmarkPolyline2d", LandmarkPolyline2d::create);
}
} /* namespace wolf */
diff --git a/src/yaml/processor_odom_icp_yaml.cpp b/src/yaml/processor_odom_icp_yaml.cpp
index ca24d0f2f..f694eee06 100644
--- a/src/yaml/processor_odom_icp_yaml.cpp
+++ b/src/yaml/processor_odom_icp_yaml.cpp
@@ -58,7 +58,7 @@ ParamsProcessorBasePtr createParamsProcessorOdomIcp(const std::string& _filename
}
// register into factory
-const bool WOLF_UNUSED registered_odom_Icp_params = FactoryParamsProcessor::get().registerCreator("ProcessorOdomIcp", createParamsProcessorOdomIcp);
+const bool WOLF_UNUSED registered_odom_Icp_params = FactoryParamsProcessor::registerCreator("ProcessorOdomIcp", createParamsProcessorOdomIcp);
} // namespace [void]
} // namespace wolf
diff --git a/src/yaml/sensor_laser_2d_yaml.cpp b/src/yaml/sensor_laser_2d_yaml.cpp
index ddda8729a..93bcb8e55 100644
--- a/src/yaml/sensor_laser_2d_yaml.cpp
+++ b/src/yaml/sensor_laser_2d_yaml.cpp
@@ -52,7 +52,7 @@ ParamsSensorBasePtr createIntrinsicsLaser2d(const std::string& _filename_dot_yam
}
// register into factory
-const bool WOLF_UNUSED registered_laser_params = FactoryParamsSensor::get().registerCreator("SensorLaser2d", createIntrinsicsLaser2d);
+const bool WOLF_UNUSED registered_laser_params = FactoryParamsSensor::registerCreator("SensorLaser2d", createIntrinsicsLaser2d);
} // namespace [void]
} // namespace wolf
diff --git a/test/gtest_processor_odom_icp.cpp b/test/gtest_processor_odom_icp.cpp
index d70ebc5af..8b8d0fbb3 100644
--- a/test/gtest_processor_odom_icp.cpp
+++ b/test/gtest_processor_odom_icp.cpp
@@ -84,7 +84,7 @@ TEST(ParamsProcessorOdomIcp, default_construct_and_print)
TEST(ParamsProcessorOdomIcp, factory_and_print)
{
- auto params = std::static_pointer_cast<ParamsProcessorOdomIcp>(FactoryParamsProcessor::get().create("ProcessorOdomIcp", laser_root_dir + "/test/yaml/processor_odom_icp.yaml"));
+ auto params = std::static_pointer_cast<ParamsProcessorOdomIcp>(FactoryParamsProcessor::create("ProcessorOdomIcp", laser_root_dir + "/test/yaml/processor_odom_icp.yaml"));
ASSERT_TRUE(params); // not nullptr
// check a couple of entries.
@@ -105,7 +105,7 @@ TEST(ProcessorOdomIcp, Constructor)
TEST(ProcessorOdomIcp, creator_yaml)
{
- auto params = std::static_pointer_cast<ParamsProcessorOdomIcp>(FactoryParamsProcessor::get().create("ProcessorOdomIcp", laser_root_dir + "/test/yaml/processor_odom_icp.yaml"));
+ auto params = std::static_pointer_cast<ParamsProcessorOdomIcp>(FactoryParamsProcessor::create("ProcessorOdomIcp", laser_root_dir + "/test/yaml/processor_odom_icp.yaml"));
auto prc = std::make_shared<ProcessorOdomIcp>(params);
ASSERT_TRUE(prc); // not nullptr
--
GitLab