Merge branch 'master' into gaisser_small_bugfix_subsystem

objectmanager/ObjectManager.cpp

@@ -1,5 +1,5 @@
-#include <framework/objectmanager/ObjectManager.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "ObjectManager.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
 #include <iomanip>
 #include <cstdlib>
 

objectmanager/ObjectManager.h

@@ -8,8 +8,8 @@
 #ifndef OBJECTMANAGER_H_
 #define OBJECTMANAGER_H_
 
-#include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/objectmanager/SystemObjectIF.h>
+#include "ObjectManagerIF.h"
+#include "SystemObjectIF.h"
 #include <map>
 
 /**

objectmanager/ObjectManagerIF.h

@@ -1,10 +1,10 @@
 #ifndef FRAMEWORK_OBJECTMANAGER_OBJECTMANAGERIF_H_
 #define FRAMEWORK_OBJECTMANAGER_OBJECTMANAGERIF_H_
 
-#include <framework/objectmanager/frameworkObjects.h>
-#include <framework/objectmanager/SystemObjectIF.h>
-#include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "frameworkObjects.h"
+#include "SystemObjectIF.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
 
 /**
  * @brief	This class provides an interface to the global object manager.

objectmanager/SystemObject.cpp

@@ -1,6 +1,6 @@
-#include <framework/events/EventManagerIF.h>
-#include <framework/objectmanager/ObjectManager.h>
-#include <framework/objectmanager/SystemObject.h>
+#include "../events/EventManagerIF.h"
+#include "ObjectManager.h"
+#include "SystemObject.h"
 
 SystemObject::SystemObject(object_id_t setObjectId, bool doRegister) :
 		objectId(setObjectId), registered(doRegister) {

objectmanager/SystemObject.h

@@ -8,10 +8,10 @@
 #ifndef SYSTEMOBJECT_H_
 #define SYSTEMOBJECT_H_
 
-#include <framework/events/Event.h>
-#include <framework/events/EventReportingProxyIF.h>
-#include <framework/objectmanager/SystemObjectIF.h>
-#include <framework/timemanager/Clock.h>
+#include "../events/Event.h"
+#include "../events/EventReportingProxyIF.h"
+#include "SystemObjectIF.h"
+#include "../timemanager/Clock.h"
 
 /**
  * @brief	This class automates insertion into the ObjectManager and

objectmanager/SystemObjectIF.h

@@ -8,8 +8,8 @@
 #ifndef SYSTEMOBJECTIF_H_
 #define SYSTEMOBJECTIF_H_
 
-#include <framework/events/EventReportingProxyIF.h>
-#include <framework/returnvalues/HasReturnvaluesIF.h>
+#include "../events/EventReportingProxyIF.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
 #include <stdint.h>
 /**
  * \defgroup system_objects Software System Object Management