From fff0131c9b27b25d8705ce42837f432035b51741 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 4 Sep 2020 15:20:07 +0200 Subject: [PATCH] taken over changes --- health/HealthHelper.cpp | 2 +- health/HealthHelper.h | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/health/HealthHelper.cpp b/health/HealthHelper.cpp index 61718f99..cced11d9 100644 --- a/health/HealthHelper.cpp +++ b/health/HealthHelper.cpp @@ -1,4 +1,4 @@ -#include "../health/HealthHelper.h" +#include "HealthHelper.h" #include "../serviceinterface/ServiceInterfaceStream.h" HealthHelper::HealthHelper(HasHealthIF* owner, object_id_t objectId) : diff --git a/health/HealthHelper.h b/health/HealthHelper.h index d8b81ca9..d1f1945c 100644 --- a/health/HealthHelper.h +++ b/health/HealthHelper.h @@ -1,11 +1,12 @@ -#ifndef FRAMEWORK_HEALTH_HEALTHHELPER_H_ -#define FRAMEWORK_HEALTH_HEALTHHELPER_H_ +#ifndef FSFW_HEALTH_HEALTHHELPER_H_ +#define FSFW_HEALTH_HEALTHHELPER_H_ + +#include "HasHealthIF.h" +#include "HealthMessage.h" +#include "HealthTableIF.h" #include "../events/EventManagerIF.h" #include "../events/EventReportingProxyIF.h" -#include "../health/HasHealthIF.h" -#include "../health/HealthMessage.h" -#include "../health/HealthTableIF.h" #include "../ipc/MessageQueueIF.h" #include "../objectmanager/ObjectManagerIF.h" #include "../returnvalues/HasReturnvaluesIF.h" @@ -118,4 +119,4 @@ private: void handleSetHealthCommand(CommandMessage *message); }; -#endif /* HEALTHHELPER_H_ */ +#endif /* FSFW_HEALTH_HEALTHHELPER_H_ */