Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements

osal/linux/Clock.cpp

@@ -1,5 +1,5 @@
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/timemanager/Clock.h>
+#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "../../timemanager/Clock.h"
 
 #include <sys/time.h>
 #include <sys/sysinfo.h>

osal/linux/FixedTimeslotTask.cpp

@@ -1,5 +1,5 @@
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/osal/linux/FixedTimeslotTask.h>
+#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "FixedTimeslotTask.h"
 
 #include <limits.h>
 

osal/linux/FixedTimeslotTask.h

@@ -1,9 +1,9 @@
 #ifndef FRAMEWORK_OSAL_LINUX_FIXEDTIMESLOTTASK_H_
 #define FRAMEWORK_OSAL_LINUX_FIXEDTIMESLOTTASK_H_
 
-#include <framework/tasks/FixedTimeslotTaskIF.h>
-#include <framework/devicehandlers/FixedSlotSequence.h>
-#include <framework/osal/linux/PosixThread.h>
+#include "../../tasks/FixedTimeslotTaskIF.h"
+#include "../../devicehandlers/FixedSlotSequence.h"
+#include "PosixThread.h"
 #include <pthread.h>
 
 class FixedTimeslotTask: public FixedTimeslotTaskIF, public PosixThread {

osal/linux/InternalErrorCodes.cpp

@@ -1,4 +1,4 @@
-#include <framework/osal/InternalErrorCodes.h>
+#include "../../osal/InternalErrorCodes.h"
 
 ReturnValue_t InternalErrorCodes::translate(uint8_t code) {
 	//TODO This class can be removed

osal/linux/MessageQueue.cpp

@@ -1,5 +1,5 @@
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/osal/linux/MessageQueue.h>
+#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "MessageQueue.h"
 
 #include <fstream>
 

osal/linux/MessageQueue.h

@@ -1,9 +1,9 @@
 #ifndef MESSAGEQUEUE_H_
 #define MESSAGEQUEUE_H_
 
-#include <framework/internalError/InternalErrorReporterIF.h>
-#include <framework/ipc/MessageQueueIF.h>
-#include <framework/ipc/MessageQueueMessage.h>
+#include "../../internalError/InternalErrorReporterIF.h"
+#include "../../ipc/MessageQueueIF.h"
+#include "../../ipc/MessageQueueMessage.h"
 
 #include <mqueue.h>
 /**

osal/linux/Mutex.cpp

@@ -1,6 +1,6 @@
-#include <framework/osal/linux/Mutex.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/timemanager/Clock.h>
+#include "Mutex.h"
+#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "../../timemanager/Clock.h"
 
 uint8_t Mutex::count = 0;
 

osal/linux/Mutex.h

@@ -1,11 +1,8 @@
 #ifndef OS_LINUX_MUTEX_H_
 #define OS_LINUX_MUTEX_H_
 
-#include <framework/ipc/MutexIF.h>
-
-extern "C" {
+#include "../../ipc/MutexIF.h"
 #include <pthread.h>
-}
 
 
 class Mutex : public MutexIF {

osal/linux/MutexFactory.cpp

@@ -1,5 +1,5 @@
-#include <framework/ipc/MutexFactory.h>
-#include <framework/osal/linux/Mutex.h>
+#include "../../ipc/MutexFactory.h"
+#include "Mutex.h"
 
 //TODO: Different variant than the lazy loading in QueueFactory. What's better and why?
 MutexFactory* MutexFactory::factoryInstance = new MutexFactory();

osal/linux/PeriodicPosixTask.cpp

@@ -1,7 +1,7 @@
-#include <framework/tasks/ExecutableObjectIF.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "../../tasks/ExecutableObjectIF.h"
+#include "../../serviceinterface/ServiceInterfaceStream.h"
 #include <errno.h>
-#include <framework/osal/linux/PeriodicPosixTask.h>
+#include "PeriodicPosixTask.h"
 
 PeriodicPosixTask::PeriodicPosixTask(const char* name_, int priority_,
 		size_t stackSize_, uint32_t period_, void(deadlineMissedFunc_)()):

osal/linux/PeriodicPosixTask.h

@@ -1,10 +1,10 @@
 #ifndef FRAMEWORK_OSAL_LINUX_PERIODICPOSIXTASK_H_
 #define FRAMEWORK_OSAL_LINUX_PERIODICPOSIXTASK_H_
 
-#include <framework/tasks/PeriodicTaskIF.h>
-#include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/osal/linux/PosixThread.h>
-#include <framework/tasks/ExecutableObjectIF.h>
+#include "../../tasks/PeriodicTaskIF.h"
+#include "../../objectmanager/ObjectManagerIF.h"
+#include "PosixThread.h"
+#include "../../tasks/ExecutableObjectIF.h"
 #include <vector>
 
 class PeriodicPosixTask: public PosixThread, public PeriodicTaskIF {

osal/linux/PosixThread.cpp

@@ -1,5 +1,5 @@
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/osal/linux/PosixThread.h>
+#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "PosixThread.h"
 #include <cstring>
 #include <errno.h>
 

osal/linux/PosixThread.h

@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_OSAL_LINUX_POSIXTHREAD_H_
 #define FRAMEWORK_OSAL_LINUX_POSIXTHREAD_H_
 
-#include <framework/returnvalues/HasReturnvaluesIF.h>
+#include "../../returnvalues/HasReturnvaluesIF.h"
 #include <pthread.h>
 #include <signal.h>
 #include <cstdlib>

osal/linux/QueueFactory.cpp

@@ -1,8 +1,8 @@
-#include <framework/ipc/QueueFactory.h>
+#include "../../ipc/QueueFactory.h"
 #include <mqueue.h>
 #include <errno.h>
-#include <framework/osal/linux/MessageQueue.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "MessageQueue.h"
+#include "../../serviceinterface/ServiceInterfaceStream.h"
 #include <cstring>
 
 QueueFactory* QueueFactory::factoryInstance = nullptr;

osal/linux/TaskFactory.cpp

@@ -1,7 +1,7 @@
-#include <framework/osal/linux/FixedTimeslotTask.h>
-#include <framework/osal/linux/PeriodicPosixTask.h>
-#include <framework/tasks/TaskFactory.h>
-#include <framework/returnvalues/HasReturnvaluesIF.h>
+#include "FixedTimeslotTask.h"
+#include "PeriodicPosixTask.h"
+#include "../../tasks/TaskFactory.h"
+#include "../../returnvalues/HasReturnvaluesIF.h"
 
 //TODO: Different variant than the lazy loading in QueueFactory. What's better and why?
 TaskFactory* TaskFactory::factoryInstance = new TaskFactory();

osal/linux/Timer.cpp

@@ -1,6 +1,6 @@
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "../../serviceinterface/ServiceInterfaceStream.h"
 #include <errno.h>
-#include <framework/osal/linux/Timer.h>
+#include "Timer.h"
 
 Timer::Timer() {
 	sigevent sigEvent;