From a1f5272fb699e3f7b2142592e0f353915af6c691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu> Date: Sat, 3 Aug 2019 23:36:14 +0200 Subject: [PATCH] Cleanup processors registration calls --- hello_wolf/processor_range_bearing.cpp | 3 --- src/processor/processor_diff_drive.cpp | 6 ++---- src/processor/processor_odom_2D.cpp | 6 ++---- src/processor/processor_odom_3D.cpp | 3 ++- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/hello_wolf/processor_range_bearing.cpp b/hello_wolf/processor_range_bearing.cpp index 20c199203..3dda45a3e 100644 --- a/hello_wolf/processor_range_bearing.cpp +++ b/hello_wolf/processor_range_bearing.cpp @@ -156,9 +156,6 @@ Eigen::Vector2s ProcessorRangeBearing::rect(Scalar range, Scalar bearing) const namespace wolf { WOLF_REGISTER_PROCESSOR("RANGE BEARING", ProcessorRangeBearing) -} // namespace wolf -namespace wolf -{ WOLF_REGISTER_PROCESSOR_AUTO("RANGE BEARING", ProcessorRangeBearing) } // namespace wolf diff --git a/src/processor/processor_diff_drive.cpp b/src/processor/processor_diff_drive.cpp index 261a3e367..8c31ff7a7 100644 --- a/src/processor/processor_diff_drive.cpp +++ b/src/processor/processor_diff_drive.cpp @@ -174,9 +174,7 @@ FactorBasePtr ProcessorDiffDrive::emplaceFactor(FeatureBasePtr _feature, // Register in the ProcessorFactory #include "core/processor/processor_factory.h" namespace wolf { -WOLF_REGISTER_PROCESSOR("DIFF DRIVE", ProcessorDiffDrive) -} // namespace wolf -namespace wolf { - WOLF_REGISTER_PROCESSOR_AUTO("DIFF DRIVE", ProcessorDiffDrive) +WOLF_REGISTER_PROCESSOR("DIFF DRIVE", ProcessorDiffDrive); +WOLF_REGISTER_PROCESSOR_AUTO("DIFF DRIVE", ProcessorDiffDrive); } // namespace wolf diff --git a/src/processor/processor_odom_2D.cpp b/src/processor/processor_odom_2D.cpp index 58131ed91..9ed0539fc 100644 --- a/src/processor/processor_odom_2D.cpp +++ b/src/processor/processor_odom_2D.cpp @@ -174,8 +174,6 @@ FeatureBasePtr ProcessorOdom2D::emplaceFeature(CaptureMotionPtr _capture_motion) // Register in the ProcessorFactory #include "core/processor/processor_factory.h" namespace wolf { -WOLF_REGISTER_PROCESSOR("ODOM 2D", ProcessorOdom2D) -} // namespace wolf -namespace wolf { - WOLF_REGISTER_PROCESSOR_AUTO("ODOM 2D", ProcessorOdom2D) +WOLF_REGISTER_PROCESSOR("ODOM 2D", ProcessorOdom2D); +WOLF_REGISTER_PROCESSOR_AUTO("ODOM 2D", ProcessorOdom2D); } // namespace wolf diff --git a/src/processor/processor_odom_3D.cpp b/src/processor/processor_odom_3D.cpp index 6486554ec..204ecd9d5 100644 --- a/src/processor/processor_odom_3D.cpp +++ b/src/processor/processor_odom_3D.cpp @@ -419,5 +419,6 @@ void ProcessorOdom3D::remap(const Eigen::VectorXs& _x1, const Eigen::VectorXs& _ // Register in the SensorFactory #include "core/processor/processor_factory.h" namespace wolf { -WOLF_REGISTER_PROCESSOR("ODOM 3D", ProcessorOdom3D) +WOLF_REGISTER_PROCESSOR("ODOM 3D", ProcessorOdom3D); +WOLF_REGISTER_PROCESSOR_AUTO("ODOM 3D", ProcessorOdom3D); } // namespace wolf -- GitLab