From bd9b51d0eb5d28f5837a3c878d2171c4c23951fa Mon Sep 17 00:00:00 2001 From: Rainer Kartmann <rainer.kartmann@kit.edu> Date: Tue, 3 Aug 2021 18:07:42 +0200 Subject: [PATCH] Make includes absolute --- source/RobotAPI/libraries/armem/core/base/EntityBase.h | 4 ++-- .../libraries/armem/core/base/EntityInstanceBase.h | 5 ++--- .../armem/core/base/detail/EntityContainerBase.h | 8 ++++---- .../libraries/armem/core/base/detail/MemoryItem.h | 2 +- .../libraries/armem/core/workingmemory/CoreSegment.h | 2 +- .../RobotAPI/libraries/armem/core/workingmemory/Entity.h | 2 +- .../libraries/armem/core/workingmemory/EntityInstance.h | 2 +- .../libraries/armem/core/workingmemory/EntitySnapshot.h | 2 +- .../libraries/armem/core/workingmemory/ProviderSegment.h | 3 +-- 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/source/RobotAPI/libraries/armem/core/base/EntityBase.h b/source/RobotAPI/libraries/armem/core/base/EntityBase.h index f8c19146c..d4193c15b 100644 --- a/source/RobotAPI/libraries/armem/core/base/EntityBase.h +++ b/source/RobotAPI/libraries/armem/core/base/EntityBase.h @@ -7,8 +7,8 @@ #include <ArmarXCore/core/exceptions/local/ExpressionException.h> -#include "../../core/Time.h" -#include "../../core/MemoryID.h" +#include <RobotAPI/libraries/armem/core/MemoryID.h> +#include <RobotAPI/libraries/armem/core/Time.h> #include "EntitySnapshotBase.h" #include "detail/MaxHistorySize.h" diff --git a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h index 18f3319d1..61ae186ed 100644 --- a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h +++ b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h @@ -1,8 +1,7 @@ #pragma once -#include "../../core/Time.h" - -#include "../Commit.h" +#include <RobotAPI/libraries/armem/core/Commit.h> +#include <RobotAPI/libraries/armem/core/Time.h> #include "detail/MemoryItem.h" diff --git a/source/RobotAPI/libraries/armem/core/base/detail/EntityContainerBase.h b/source/RobotAPI/libraries/armem/core/base/detail/EntityContainerBase.h index 452277eca..96d1512df 100644 --- a/source/RobotAPI/libraries/armem/core/base/detail/EntityContainerBase.h +++ b/source/RobotAPI/libraries/armem/core/base/detail/EntityContainerBase.h @@ -1,12 +1,12 @@ #pragma once -#include "../../Commit.h" -#include "../../error/ArMemError.h" +#include <RobotAPI/libraries/armem/core/Commit.h> +#include <RobotAPI/libraries/armem/core/error/ArMemError.h> #include "MemoryContainerBase.h" -#include "../EntityBase.h" -#include "../EntitySnapshotBase.h" +#include <RobotAPI/libraries/armem/core/base/EntityBase.h> +#include <RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h> namespace armarx::armem::base::detail diff --git a/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h b/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h index c70c68ada..b26ceb19d 100644 --- a/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h +++ b/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h @@ -2,7 +2,7 @@ #include <string> -#include "../../MemoryID.h" +#include <RobotAPI/libraries/armem/core/MemoryID.h> namespace armarx::armem::base::detail diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h b/source/RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h index 86b9b439e..54df4ff40 100644 --- a/source/RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h +++ b/source/RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h @@ -3,7 +3,7 @@ #include <mutex> #include <optional> -#include "../base/CoreSegmentBase.h" +#include <RobotAPI/libraries/armem/core/base/CoreSegmentBase.h> #include "ProviderSegment.h" #include "detail/CopyWithoutData.h" diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/Entity.h b/source/RobotAPI/libraries/armem/core/workingmemory/Entity.h index a6a7621e2..d8e29a794 100644 --- a/source/RobotAPI/libraries/armem/core/workingmemory/Entity.h +++ b/source/RobotAPI/libraries/armem/core/workingmemory/Entity.h @@ -1,6 +1,6 @@ #pragma once -#include "../base/EntityBase.h" +#include <RobotAPI/libraries/armem/core/base/EntityBase.h> #include "EntitySnapshot.h" #include "detail/CopyWithoutData.h" diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h b/source/RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h index d3dc888d0..5e60a7596 100644 --- a/source/RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h +++ b/source/RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h @@ -1,6 +1,6 @@ #pragma once -#include "../base/EntityInstanceBase.h" +#include <RobotAPI/libraries/armem/core/base/EntityInstanceBase.h> #include "detail/CopyWithoutData.h" diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/EntitySnapshot.h b/source/RobotAPI/libraries/armem/core/workingmemory/EntitySnapshot.h index 3eedb48d0..fb3123eb7 100644 --- a/source/RobotAPI/libraries/armem/core/workingmemory/EntitySnapshot.h +++ b/source/RobotAPI/libraries/armem/core/workingmemory/EntitySnapshot.h @@ -1,6 +1,6 @@ #pragma once -#include "../base/EntitySnapshotBase.h" +#include <RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h> #include "EntityInstance.h" #include "detail/CopyWithoutData.h" diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h b/source/RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h index 7d1e9db33..f3e708628 100644 --- a/source/RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h +++ b/source/RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h @@ -1,6 +1,6 @@ #pragma once -#include "../base/ProviderSegmentBase.h" +#include <RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h> #include "Entity.h" #include "detail/CopyWithoutData.h" @@ -15,7 +15,6 @@ namespace armarx::armem::wm class ProviderSegment : public base::ProviderSegmentBase<Entity, ProviderSegment>, public detail::CopyWithoutData<ProviderSegment> - { using Base = base::ProviderSegmentBase<Entity, ProviderSegment>; -- GitLab