From a37757f8b7c703c7ae52eb0ba0c01cfc569092d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu> Date: Tue, 13 Aug 2019 13:51:12 +0200 Subject: [PATCH] Remove FrameFactory and its registering macro --- include/core/common/factory.h | 18 ------------------ include/core/sensor/sensor_factory.h | 1 + 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/include/core/common/factory.h b/include/core/common/factory.h index 8152d007c..25c819a9c 100644 --- a/include/core/common/factory.h +++ b/include/core/common/factory.h @@ -344,20 +344,6 @@ inline std::string LandmarkFactory::getClass() return "LandmarkFactory"; } -// Frames -class TimeStamp; -} // namespace wolf -#include "core/frame/frame_base.h" -namespace wolf{ -typedef Factory<FrameBase, const FrameType&, const TimeStamp&, const Eigen::VectorXs&> FrameFactory; -template<> -inline std::string FrameFactory::getClass() -{ - return "FrameFactory"; -} - -//#define UNUSED(x) (void)x; -//#define UNUSED(x) (void)(sizeof((x), 0)); #ifdef __GNUC__ #define WOLF_UNUSED __attribute__((used)) @@ -372,10 +358,6 @@ inline std::string FrameFactory::getClass() # define UNUSED(x) x #endif -#define WOLF_REGISTER_FRAME(FrameType, FrameName) \ - namespace{ const bool WOLF_UNUSED FrameName##Registered = \ - wolf::FrameFactory::get().registerCreator(FrameType, FrameName::create); }\ - } /* namespace wolf */ #endif /* FACTORY_H_ */ diff --git a/include/core/sensor/sensor_factory.h b/include/core/sensor/sensor_factory.h index 1cd726227..4e4c8306a 100644 --- a/include/core/sensor/sensor_factory.h +++ b/include/core/sensor/sensor_factory.h @@ -16,6 +16,7 @@ struct IntrinsicsBase; // wolf #include "core/common/factory.h" +#include "core/utils/params_server.hpp" namespace wolf { -- GitLab