From 66b65fc5b3a544c004c42e5bb46b2e2db354d4de Mon Sep 17 00:00:00 2001
From: jcasals <jcasals@iri.upc.edu>
Date: Tue, 21 Apr 2020 12:14:19 +0200
Subject: [PATCH] Unify parameters of WOLF_REGISTER macros definition
---
include/core/processor/factory_processor.h | 12 ++++++------
include/core/sensor/factory_sensor.h | 12 ++++++------
include/core/solver/factory_solver.h | 6 +++---
include/core/tree_manager/factory_tree_manager.h | 12 ++++++------
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/core/processor/factory_processor.h b/include/core/processor/factory_processor.h
index e744f5325..738d3558a 100644
--- a/include/core/processor/factory_processor.h
+++ b/include/core/processor/factory_processor.h
@@ -185,9 +185,9 @@ inline std::string FactoryProcessor::getClass()
return "FactoryProcessor";
}
-#define WOLF_REGISTER_PROCESSOR(ProcessorType, ProcessorName) \
- namespace{ const bool WOLF_UNUSED ProcessorName##Registered = \
- wolf::FactoryProcessor::get().registerCreator(ProcessorType, ProcessorName::create); } \
+#define WOLF_REGISTER_PROCESSOR(ProcessorType) \
+ namespace{ const bool WOLF_UNUSED ProcessorType##Registered = \
+ wolf::FactoryProcessor::get().registerCreator(#ProcessorType, ProcessorType::create); } \
typedef Factory<ProcessorBase,
const std::string&,
@@ -199,9 +199,9 @@ inline std::string AutoConfFactoryProcessor::getClass()
}
-#define WOLF_REGISTER_PROCESSOR_AUTO(ProcessorType, ProcessorName) \
- namespace{ const bool WOLF_UNUSED ProcessorName##AutoConfRegistered = \
- wolf::AutoConfFactoryProcessor::get().registerCreator(ProcessorType, ProcessorName::create); } \
+#define WOLF_REGISTER_PROCESSOR_AUTO(ProcessorType) \
+ namespace{ const bool WOLF_UNUSED ProcessorType##AutoConfRegistered = \
+ wolf::AutoConfFactoryProcessor::get().registerCreator(#ProcessorType, ProcessorType::create); } \
} /* namespace wolf */
diff --git a/include/core/sensor/factory_sensor.h b/include/core/sensor/factory_sensor.h
index cae320bba..67ef5f597 100644
--- a/include/core/sensor/factory_sensor.h
+++ b/include/core/sensor/factory_sensor.h
@@ -230,9 +230,9 @@ inline std::string FactorySensor::getClass()
return "FactorySensor";
}
-#define WOLF_REGISTER_SENSOR(SensorType, SensorName) \
- namespace{ const bool WOLF_UNUSED SensorName##Registered = \
- FactorySensor::get().registerCreator(SensorType, SensorName::create); } \
+#define WOLF_REGISTER_SENSOR(SensorType) \
+ namespace{ const bool WOLF_UNUSED SensorType##Registered = \
+ FactorySensor::get().registerCreator(#SensorType, SensorType::create); } \
typedef Factory<SensorBase,
@@ -245,9 +245,9 @@ inline std::string AutoConfFactorySensor::getClass()
return "AutoConfFactorySensor";
}
-#define WOLF_REGISTER_SENSOR_AUTO(SensorType, SensorName) \
- namespace{ const bool WOLF_UNUSED SensorName##AutoConfRegistered = \
- AutoConfFactorySensor::get().registerCreator(SensorType, SensorName::create); } \
+#define WOLF_REGISTER_SENSOR_AUTO(SensorType) \
+ namespace{ const bool WOLF_UNUSED SensorType##AutoConfRegistered = \
+ AutoConfFactorySensor::get().registerCreator(#SensorType, SensorType::create); } \
} /* namespace wolf */
diff --git a/include/core/solver/factory_solver.h b/include/core/solver/factory_solver.h
index 4c9971d90..b05521782 100644
--- a/include/core/solver/factory_solver.h
+++ b/include/core/solver/factory_solver.h
@@ -219,9 +219,9 @@ inline std::string FactorySolver::getClass()
return "FactorySolver";
}
-#define WOLF_REGISTER_SOLVER(SolverType, SolverName) \
- namespace{ const bool WOLF_UNUSED SolverName##Registered = \
- wolf::FactorySolver::get().registerCreator(SolverType, SolverName::create); } \
+#define WOLF_REGISTER_SOLVER(SolverType) \
+ namespace{ const bool WOLF_UNUSED SolverType##Registered = \
+ wolf::FactorySolver::get().registerCreator(#SolverType, SolverType::create); } \
} /* namespace wolf */
diff --git a/include/core/tree_manager/factory_tree_manager.h b/include/core/tree_manager/factory_tree_manager.h
index 7b421461c..91f2b9531 100644
--- a/include/core/tree_manager/factory_tree_manager.h
+++ b/include/core/tree_manager/factory_tree_manager.h
@@ -38,9 +38,9 @@ inline std::string FactoryTreeManager::getClass()
return "FactoryTreeManager";
}
-#define WOLF_REGISTER_TREE_MANAGER(TreeManagerType, TreeManagerName) \
- namespace{ const bool WOLF_UNUSED TreeManagerName##Registered = \
- wolf::FactoryTreeManager::get().registerCreator(TreeManagerType, TreeManagerName::create); } \
+#define WOLF_REGISTER_TREE_MANAGER(TreeManagerType) \
+ namespace{ const bool WOLF_UNUSED TreeManagerType##Registered = \
+ wolf::FactoryTreeManager::get().registerCreator(#TreeManagerType, TreeManagerType::create); } \
typedef Factory<TreeManagerBase,
const std::string&,
@@ -52,9 +52,9 @@ inline std::string AutoConfFactoryTreeManager::getClass()
}
-#define WOLF_REGISTER_TREE_MANAGER_AUTO(TreeManagerType, TreeManagerName) \
- namespace{ const bool WOLF_UNUSED TreeManagerName##AutoConfRegistered = \
- wolf::AutoConfFactoryTreeManager::get().registerCreator(TreeManagerType, TreeManagerName::create); } \
+#define WOLF_REGISTER_TREE_MANAGER_AUTO(TreeManagerType) \
+ namespace{ const bool WOLF_UNUSED TreeManagerType##AutoConfRegistered = \
+ wolf::AutoConfFactoryTreeManager::get().registerCreator(#TreeManagerType, TreeManagerType::create); } \
} /* namespace wolf */
--
GitLab