From 5885e2687b1a661de816ac5051f99a10b2a2a9cf Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Wed, 28 Sep 2022 14:19:51 +0200 Subject: [PATCH] iox-#605 Rename include guard for classes in 'memory' module Signed-off-by: Simon Hoinkis --- .../iceoryx_hoofs/internal/memory/pointer_repository.hpp | 6 +++--- .../iceoryx_hoofs/internal/memory/pointer_repository.inl | 6 +++--- .../iceoryx_hoofs/internal/memory/relative_pointer.hpp | 6 +++--- .../iceoryx_hoofs/internal/memory/relative_pointer.inl | 6 +++--- .../iceoryx_hoofs/internal/memory/relative_pointer_data.hpp | 6 +++--- .../iceoryx_hoofs/internal/memory/relative_pointer_data.inl | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/pointer_repository.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/pointer_repository.hpp index e840775631..1488869157 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/pointer_repository.hpp +++ b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/pointer_repository.hpp @@ -15,8 +15,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#ifndef IOX_HOOFS_RELOCATABLE_POINTER_POINTER_REPOSITORY_HPP -#define IOX_HOOFS_RELOCATABLE_POINTER_POINTER_REPOSITORY_HPP +#ifndef IOX_HOOFS_MEMORY_POINTER_REPOSITORY_HPP +#define IOX_HOOFS_MEMORY_POINTER_REPOSITORY_HPP #include "iceoryx_hoofs/cxx/optional.hpp" #include "iceoryx_hoofs/cxx/vector.hpp" @@ -117,4 +117,4 @@ class PointerRepository #include "iceoryx_hoofs/internal/memory/pointer_repository.inl" -#endif // IOX_HOOFS_RELOCATABLE_POINTER_POINTER_REPOSITORY_HPP +#endif // IOX_HOOFS_MEMORY_POINTER_REPOSITORY_HPP diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/pointer_repository.inl b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/pointer_repository.inl index 2212ed97e9..72845434e3 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/pointer_repository.inl +++ b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/pointer_repository.inl @@ -15,8 +15,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#ifndef IOX_HOOFS_RELOCATABLE_POINTER_POINTER_REPOSITORY_INL -#define IOX_HOOFS_RELOCATABLE_POINTER_POINTER_REPOSITORY_INL +#ifndef IOX_HOOFS_MEMORY_POINTER_REPOSITORY_INL +#define IOX_HOOFS_MEMORY_POINTER_REPOSITORY_INL #include "iceoryx_hoofs/internal/memory/pointer_repository.hpp" @@ -139,4 +139,4 @@ inline bool PointerRepository::addPointerIfIdIsFree(const } // namespace memory } // namespace iox -#endif // IOX_HOOFS_RELOCATABLE_POINTER_POINTER_REPOSITORY_INL +#endif // IOX_HOOFS_MEMORY_POINTER_REPOSITORY_INL diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.hpp index 0957a5c9da..d34d3ec442 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.hpp +++ b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.hpp @@ -15,8 +15,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#ifndef IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_HPP -#define IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_HPP +#ifndef IOX_HOOFS_MEMORY_RELATIVE_POINTER_HPP +#define IOX_HOOFS_MEMORY_RELATIVE_POINTER_HPP #include "iceoryx_hoofs/cxx/newtype.hpp" #include "iceoryx_hoofs/internal/memory/pointer_repository.hpp" @@ -213,4 +213,4 @@ PointerRepository& getRe #include "iceoryx_hoofs/internal/memory/relative_pointer.inl" -#endif // IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_HPP +#endif // IOX_HOOFS_MEMORY_RELATIVE_POINTER_HPP diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.inl b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.inl index b1fc43372c..33781362cd 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.inl +++ b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.inl @@ -15,8 +15,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#ifndef IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_INL -#define IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_INL +#ifndef IOX_HOOFS_MEMORY_RELATIVE_POINTER_INL +#define IOX_HOOFS_MEMORY_RELATIVE_POINTER_INL #include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" @@ -247,4 +247,4 @@ inline PointerRepository } // namespace memory } // namespace iox -#endif // IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_INL +#endif // IOX_HOOFS_MEMORY_RELATIVE_POINTER_INL diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer_data.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer_data.hpp index 987b8b0cb5..4cfeb3f9a2 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer_data.hpp +++ b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer_data.hpp @@ -14,8 +14,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#ifndef IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_DATA_HPP -#define IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_DATA_HPP +#ifndef IOX_HOOFS_MEMORY_RELATIVE_POINTER_DATA_HPP +#define IOX_HOOFS_MEMORY_RELATIVE_POINTER_DATA_HPP #include "iceoryx_hoofs/cxx/helplets.hpp" @@ -84,4 +84,4 @@ class RelativePointerData #include "iceoryx_hoofs/internal/memory/relative_pointer_data.inl" -#endif // IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_DATA_HPP +#endif // IOX_HOOFS_MEMORY_RELATIVE_POINTER_DATA_HPP diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer_data.inl b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer_data.inl index c1d658e63d..4ffeee44d8 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer_data.inl +++ b/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer_data.inl @@ -14,8 +14,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#ifndef IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_DATA_INL -#define IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_DATA_INL +#ifndef IOX_HOOFS_MEMORY_RELATIVE_POINTER_DATA_INL +#define IOX_HOOFS_MEMORY_RELATIVE_POINTER_DATA_INL #include "iceoryx_hoofs/internal/memory/relative_pointer_data.hpp" @@ -35,4 +35,4 @@ constexpr RelativePointerData::RelativePointerData(identifier_t id, offset_t off } // namespace memory } // namespace iox -#endif // IOX_HOOFS_RELOCATABLE_POINTER_RELATIVE_POINTER_DATA_INL +#endif // IOX_HOOFS_MEMORY_RELATIVE_POINTER_DATA_INL