From 8e3f99a350be66308d9afabae8069426f67ce8e6 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 4 Jun 2020 14:59:14 +0200
Subject: [PATCH] removed object manager changes for now

---
 objectmanager/ObjectManagerIF.h | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/objectmanager/ObjectManagerIF.h b/objectmanager/ObjectManagerIF.h
index b5cab4080..aca24a24a 100644
--- a/objectmanager/ObjectManagerIF.h
+++ b/objectmanager/ObjectManagerIF.h
@@ -8,11 +8,10 @@
 #ifndef OBJECTMANAGERIF_H_
 #define OBJECTMANAGERIF_H_
 
-#include "systemObjectList.h"
 #include <framework/objectmanager/frameworkObjects.h>
+#include <config/objects/systemObjectList.h>
 #include <framework/objectmanager/SystemObjectIF.h>
 #include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
 
 /**
  * @brief	This class provides an interface to the global object manager.
@@ -25,12 +24,9 @@
  */
 class ObjectManagerIF : public HasReturnvaluesIF {
 public:
-	static constexpr uint8_t INTERFACE_ID = CLASS_ID::OBJECT_MANAGER_IF;
-	static constexpr ReturnValue_t INSERTION_FAILED = MAKE_RETURN_CODE( 1 );
-	static constexpr ReturnValue_t NOT_FOUND = MAKE_RETURN_CODE( 2 );
-	static constexpr ReturnValue_t CHILD_INIT_FAILED = MAKE_RETURN_CODE( 3 );
-	static constexpr ReturnValue_t INTERNAL_ERR_REPORTER_UNINIT = MAKE_RETURN_CODE( 4 );
-
+	static const uint8_t INTERFACE_ID = CLASS_ID::OBJECT_MANAGER_IF;
+	static const ReturnValue_t INSERTION_FAILED = MAKE_RETURN_CODE( 1 );
+	static const ReturnValue_t NOT_FOUND = MAKE_RETURN_CODE( 2 );
 protected:
 	/**
 	 * @brief	This method is used to hide the template-based get call from
@@ -82,22 +78,15 @@ public:
 	virtual void printList() = 0;
 };
 
+template <typename T>
+T* ObjectManagerIF::get( object_id_t id ) {
+	SystemObjectIF* temp = this->getSystemObject(id);
+	return dynamic_cast<T*>(temp);
+}
 
 /**
  * @brief	This is the forward declaration of the global objectManager instance.
  */
 extern ObjectManagerIF *objectManager;
 
-/*Documentation can be found in the class method declaration above.*/
-template <typename T>
-T* ObjectManagerIF::get( object_id_t id ) {
-	if(objectManager == nullptr) {
-		sif::error << "ObjectManagerIF: Global object manager has not "
-				"been initialized yet!" << std::endl;
-		std::exit(0);
-	}
-	SystemObjectIF* temp = this->getSystemObject(id);
-	return dynamic_cast<T*>(temp);
-}
-
 #endif /* OBJECTMANAGERIF_H_ */