iox-eclipse-iceoryx#605 remove mutex (wrong merge resolution), rename…

… files Signed-off-by: Marika Lehmann <[email protected]>
ApexAI · Mar 24, 2021 · 0052d1b · 0052d1b
1 parent dd8cd49
commit 0052d1b
Show file tree

Hide file tree

Showing 38 changed files with 64 additions and 64 deletions.
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/chunk_management.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/chunk_management.hpp
@@ -18,7 +18,7 @@
 #define IOX_POSH_MEPOO_CHUNK_MANAGEMENT_HPP
 
 #include "iceoryx_utils/cxx/helplets.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 #include <atomic>
 #include <cstdint>

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp
@@ -20,7 +20,7 @@
 #include "iceoryx_utils/cxx/helplets.hpp"
 #include "iceoryx_utils/internal/concurrent/loffli.hpp"
 #include "iceoryx_utils/internal/posix_wrapper/shared_memory_object/allocator.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 #include <atomic>
 #include <cstdint>

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl
@@ -21,7 +21,7 @@
 #include "iceoryx_posh/mepoo/memory_info.hpp"
 #include "iceoryx_posh/mepoo/mepoo_config.hpp"
 #include "iceoryx_utils/error_handling/error_handling.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 namespace iox
 {

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/shared_chunk.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/shared_chunk.hpp
@@ -20,7 +20,7 @@
 #include "iceoryx_posh/internal/mepoo/chunk_management.hpp"
 #include "iceoryx_posh/internal/mepoo/mem_pool.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 namespace iox
 {

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor_data.hpp
@@ -24,7 +24,7 @@
 #include "iceoryx_utils/cxx/vector.hpp"
 #include "iceoryx_utils/error_handling/error_handling.hpp"
 #include "iceoryx_utils/internal/posix_wrapper/mutex.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 #include <cstdint>
 #include <mutex>

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_data.hpp
@@ -23,7 +23,7 @@
 #include "iceoryx_posh/internal/popo/building_blocks/condition_notifier.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/condition_variable_data.hpp"
 #include "iceoryx_utils/cxx/variant_queue.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 #include "iceoryx_utils/posix_wrapper/semaphore.hpp"
 
 namespace iox

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_types.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_types.hpp
@@ -18,7 +18,7 @@
 #define IOX_POSH_POPO_BUILDING_BLOCKS_CHUNK_QUEUE_TYPES_HPP
 
 #include "iceoryx_posh/internal/mepoo/chunk_management.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 namespace iox
 {

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_sender_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_sender_data.hpp
@@ -23,7 +23,7 @@
 #include "iceoryx_posh/internal/popo/used_chunk_list.hpp"
 #include "iceoryx_posh/mepoo/memory_info.hpp"
 #include "iceoryx_utils/cxx/helplets.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 namespace iox
 {

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/ports/base_port_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/ports/base_port_data.hpp
@@ -20,7 +20,7 @@
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/capro/capro_message.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/typed_unique_id.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 #include <atomic>
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/ports/client_server_port_types.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/ports/client_server_port_types.hpp
@@ -20,7 +20,7 @@
 #include "iceoryx_posh/internal/popo/building_blocks/chunk_receiver_data.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/chunk_sender_data.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/locking_policy.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 #include <cstdint>
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/used_chunk_list.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/used_chunk_list.hpp
@@ -19,7 +19,7 @@
 #include "iceoryx_posh/internal/mepoo/chunk_management.hpp"
 #include "iceoryx_posh/internal/mepoo/shared_chunk.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 #include <array>
 #include <atomic>

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/process_manager.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/process_manager.hpp
@@ -210,8 +210,6 @@ class ProcessManager : public ProcessManagerInterface
     mepoo::SegmentManager<>* m_segmentManager{nullptr};
     mepoo::MemoryManager* m_introspectionMemoryManager{nullptr};
     rp::BaseRelativePointer::id_t m_mgmtSegmentId{rp::BaseRelativePointer::NULL_POINTER_ID};
-    mutable std::mutex m_mutex;
-
     ProcessList_t m_processList;
     ProcessIntrospectionType* m_processIntrospection{nullptr};
     /// @brief is currently used for the internal publisher/subscriber ports

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp
@@ -28,7 +28,7 @@
 #include "iceoryx_posh/roudi/roudi_app.hpp"
 #include "iceoryx_utils/cxx/generic_raii.hpp"
 #include "iceoryx_utils/internal/concurrent/smart_lock.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 #include "iceoryx_utils/platform/file.hpp"
 #include "iceoryx_utils/posix_wrapper/posix_access_rights.hpp"
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_interface_base.hpp b/iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_interface_base.hpp
@@ -23,7 +23,7 @@
 #include "iceoryx_utils/cxx/deadline_timer.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"
 #include "iceoryx_utils/internal/posix_wrapper/unix_domain_socket.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 #include "iceoryx_utils/internal/units/duration.hpp"
 #include "iceoryx_utils/platform/fcntl.hpp"
 #include "iceoryx_utils/platform/stat.hpp"

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/runtime/shared_memory_user.hpp b/iceoryx_posh/include/iceoryx_posh/internal/runtime/shared_memory_user.hpp
@@ -21,7 +21,7 @@
 #include "iceoryx_utils/cxx/optional.hpp"
 #include "iceoryx_utils/cxx/vector.hpp"
 #include "iceoryx_utils/internal/posix_wrapper/shared_memory_object.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/base_relative_pointer.hpp"
 
 
 namespace iox

diff --git a/iceoryx_posh/source/roudi/memory/memory_provider.cpp b/iceoryx_posh/source/roudi/memory/memory_provider.cpp
@@ -21,7 +21,7 @@
 #include "iceoryx_posh/roudi/memory/memory_block.hpp"
 
 #include "iceoryx_utils/cxx/helplets.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/base_relative_pointer.hpp"
 
 /// @todo this should probably be moved to iceoryx_utils/allocator/bump_allocator.hpp
 #include "iceoryx_utils/internal/posix_wrapper/shared_memory_object/allocator.hpp"

diff --git a/iceoryx_posh/source/roudi/process_manager.cpp b/iceoryx_posh/source/roudi/process_manager.cpp
@@ -23,7 +23,7 @@
 #include "iceoryx_utils/cxx/deadline_timer.hpp"
 #include "iceoryx_utils/cxx/smart_c.hpp"
 #include "iceoryx_utils/cxx/vector.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 #include "iceoryx_utils/platform/signal.hpp"
 #include "iceoryx_utils/platform/types.hpp"
 #include "iceoryx_utils/platform/wait.hpp"

diff --git a/iceoryx_posh/source/runtime/posh_runtime.cpp b/iceoryx_posh/source/runtime/posh_runtime.cpp
@@ -24,7 +24,7 @@
 #include "iceoryx_posh/runtime/port_config_info.hpp"
 #include "iceoryx_utils/cxx/convert.hpp"
 #include "iceoryx_utils/cxx/helplets.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/base_relative_pointer.hpp"
 #include "iceoryx_utils/posix_wrapper/timer.hpp"
 
 #include <cstdint>

diff --git a/iceoryx_posh/test/moduletests/test_mepoo_segment_management.cpp b/iceoryx_posh/test/moduletests/test_mepoo_segment_management.cpp
@@ -21,7 +21,7 @@
 #include "iceoryx_utils/error_handling/error_handling.hpp"
 #include "iceoryx_utils/internal/posix_wrapper/shared_memory_object.hpp"
 #include "iceoryx_utils/internal/posix_wrapper/shared_memory_object/allocator.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/base_relative_pointer.hpp"
 #include "test.hpp"
 #include "testutils/test_definitions.hpp"
 

diff --git a/iceoryx_posh/test/moduletests/test_mepoo_shared_pointer.cpp b/iceoryx_posh/test/moduletests/test_mepoo_shared_pointer.cpp
@@ -19,7 +19,7 @@
 #include "iceoryx_posh/internal/mepoo/shared_pointer.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
 #include "iceoryx_utils/internal/posix_wrapper/shared_memory_object/allocator.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/base_relative_pointer.hpp"
 #include "test.hpp"
 
 using namespace ::testing;

diff --git a/iceoryx_posh/test/moduletests/test_roudi_memory_provider.cpp b/iceoryx_posh/test/moduletests/test_roudi_memory_provider.cpp
@@ -16,7 +16,7 @@
 
 #include "iceoryx_posh/roudi/memory/memory_provider.hpp"
 
-#include "iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/base_relative_pointer.hpp"
 
 #include "mocks/roudi_memory_block_mock.hpp"
 #include "mocks/roudi_memory_provider_mock.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_roudi_portmanager.cpp b/iceoryx_posh/test/moduletests/test_roudi_portmanager.cpp
@@ -25,7 +25,7 @@
 #include "iceoryx_posh/internal/roudi/port_manager.hpp"
 #include "iceoryx_posh/roudi/memory/iceoryx_roudi_memory_manager.hpp"
 #include "iceoryx_utils/cxx/generic_raii.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/base_relative_pointer.hpp"
 #include "iceoryx_utils/posix_wrapper/posix_access_rights.hpp"
 
 #include <cstdint>

diff --git a/iceoryx_utils/CMakeLists.txt b/iceoryx_utils/CMakeLists.txt
@@ -165,8 +165,8 @@ add_library(iceoryx_utils
     source/posix_wrapper/posix_access_rights.cpp
     source/posix_wrapper/thread.cpp
     source/units/duration.cpp
-    source/relocatable_pointer/base_relative_ptr.cpp
-    source/relocatable_pointer/base_relocatable_ptr.cpp
+    source/relocatable_pointer/base_relative_pointer.cpp
+    source/relocatable_pointer/base_relocatable_pointer.cpp
 )
 
 add_library(iceoryx_utils::iceoryx_utils ALIAS iceoryx_utils)

diff --git a/iceoryx_utils/include/iceoryx_utils/internal/concurrent/loffli.hpp b/iceoryx_utils/include/iceoryx_utils/internal/concurrent/loffli.hpp
@@ -18,7 +18,7 @@
 #define IOX_UTILS_CONCURRENT_LOFFLI_HPP
 
 #include "iceoryx_utils/cxx/helplets.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 #include <atomic>
 #include <cstdint>

diff --git a/...atable_pointer/atomic_relocatable_ptr.hpp → ...le_pointer/atomic_relocatable_pointer.hpp b/...atable_pointer/atomic_relocatable_ptr.hpp → ...le_pointer/atomic_relocatable_pointer.hpp
@@ -15,8 +15,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_PTR_HPP
-#define IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_PTR_HPP
+#ifndef IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_POINTER_HPP
+#define IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_POINTER_HPP
 
 #include <atomic>
 #include <limits>
@@ -76,6 +76,6 @@ class AtomicRelocatablePointer
 } // namespace rp
 } // namespace iox
 
-#include "iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_ptr.inl"
+#include "iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_pointer.inl"
 
-#endif // IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_PTR_HPP
+#endif // IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_POINTER_HPP
diff --git a/...atable_pointer/atomic_relocatable_ptr.inl → ...le_pointer/atomic_relocatable_pointer.inl b/...atable_pointer/atomic_relocatable_ptr.inl → ...le_pointer/atomic_relocatable_pointer.inl
@@ -15,10 +15,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_PTR_INL
-#define IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_PTR_INL
+#ifndef IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_POINTER_INL
+#define IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_POINTER_INL
 
-#include "iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_pointer.hpp"
 
 namespace iox
 {
@@ -81,4 +81,4 @@ AtomicRelocatablePointer<T>::computeOffset(const void* ptr) const noexcept
 } // namespace rp
 } // namespace iox
 
-#endif // IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_PTR_INL
+#endif // IOX_UTILS_RELOCATABLE_POINTER_ATOMIC_RELOCATABLE_POINTER_INL
diff --git a/...relocatable_pointer/base_relative_ptr.hpp → ...catable_pointer/base_relative_pointer.hpp b/...relocatable_pointer/base_relative_ptr.hpp → ...catable_pointer/base_relative_pointer.hpp
@@ -15,8 +15,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_UTILS_RELOCATABLE_POINTER_BASE_RELATIVE_PTR_HPP
-#define IOX_UTILS_RELOCATABLE_POINTER_BASE_RELATIVE_PTR_HPP
+#ifndef IOX_UTILS_RELOCATABLE_POINTER_BASE_RELATIVE_POINTER_HPP
+#define IOX_UTILS_RELOCATABLE_POINTER_BASE_RELATIVE_POINTER_HPP
 
 #include "pointer_repository.hpp"
 
@@ -180,5 +180,5 @@ class BaseRelativePointer
 } // namespace rp
 } // namespace iox
 
-#endif // IOX_UTILS_RELOCATABLE_POINTER_BASE_RELATIVE_PTR_HPP
+#endif // IOX_UTILS_RELOCATABLE_POINTER_BASE_RELATIVE_POINTER_HPP
 
diff --git a/...ocatable_pointer/base_relocatable_ptr.hpp → ...able_pointer/base_relocatable_pointer.hpp b/...ocatable_pointer/base_relocatable_ptr.hpp → ...able_pointer/base_relocatable_pointer.hpp
@@ -15,8 +15,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_UTILS_RELOCATABLE_POINTER_BASE_RELOCATABLE_PTR_HPP
-#define IOX_UTILS_RELOCATABLE_POINTER_BASE_RELOCATABLE_PTR_HPP
+#ifndef IOX_UTILS_RELOCATABLE_POINTER_BASE_RELOCATABLE_POINTER_HPP
+#define IOX_UTILS_RELOCATABLE_POINTER_BASE_RELOCATABLE_POINTER_HPP
 
 #include <cstdint>
 #include <limits>
@@ -111,4 +111,5 @@ class BaseRelocatablePointer
 } // namespace rp
 } // namespace iox
 
-#endif // IOX_UTILS_RELOCATABLE_POINTER_BASE_RELOCATABLE_PTR_HPP
+#endif // IOX_UTILS_RELOCATABLE_POINTER_BASE_RELOCATABLE_POINTER_HPP
+
diff --git a/...rnal/relocatable_pointer/relative_ptr.hpp → .../relocatable_pointer/relative_pointer.hpp b/...rnal/relocatable_pointer/relative_ptr.hpp → .../relocatable_pointer/relative_pointer.hpp
@@ -15,10 +15,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_PTR_HPP
-#define IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_PTR_HPP
+#ifndef IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_POINTER_HPP
+#define IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_POINTER_HPP
 
-#include "base_relative_ptr.hpp"
+#include "base_relative_pointer.hpp"
 
 #include <cstdint>
 #include <iostream>
@@ -103,6 +103,7 @@ class RelativePointer : public BaseRelativePointer
 } // namespace rp
 } // namespace iox
 
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.inl"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.inl"
+
+#endif // IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_POINTER_HPP
 
-#endif // IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_PTR_HPP
diff --git a/...rnal/relocatable_pointer/relative_ptr.inl → .../relocatable_pointer/relative_pointer.inl b/...rnal/relocatable_pointer/relative_ptr.inl → .../relocatable_pointer/relative_pointer.inl
@@ -15,10 +15,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_PTR_INL
-#define IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_PTR_INL
+#ifndef IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_POINTER_INL
+#define IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_POINTER_INL
 
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 
 namespace iox
 {
@@ -118,5 +118,5 @@ inline bool RelativePointer<T>::operator!=(T* const ptr) const noexcept
 } // namespace rp
 } // namespace iox
 
-#endif // IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_PTR_INL
+#endif // IOX_UTILS_RELOCATABLE_POINTER_RELATIVE_POINTER_INL
 
diff --git a/...l/relocatable_pointer/relocatable_ptr.hpp → ...locatable_pointer/relocatable_pointer.hpp b/...l/relocatable_pointer/relocatable_ptr.hpp → ...locatable_pointer/relocatable_pointer.hpp
@@ -15,10 +15,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_PTR_HPP
-#define IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_PTR_HPP
+#ifndef IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_POINTER_HPP
+#define IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_POINTER_HPP
 
-#include "base_relocatable_ptr.hpp"
+#include "base_relocatable_pointer.hpp"
 
 namespace iox
 {
@@ -77,6 +77,6 @@ class RelocatablePointer : public BaseRelocatablePointer
 } // namespace rp
 } // namespace iox
 
-#include "iceoryx_utils/internal/relocatable_pointer/relocatable_ptr.inl"
+#include "iceoryx_utils/internal/relocatable_pointer/relocatable_pointer.inl"
 
-#endif // IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_PTR_HPP
+#endif // IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_POINTER_HPP
diff --git a/...l/relocatable_pointer/relocatable_ptr.inl → ...locatable_pointer/relocatable_pointer.inl b/...l/relocatable_pointer/relocatable_ptr.inl → ...locatable_pointer/relocatable_pointer.inl
@@ -15,10 +15,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_PTR_INL
-#define IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_PTR_INL
+#ifndef IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_POINTER_INL
+#define IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_POINTER_INL
 
-#include "iceoryx_utils/internal/relocatable_pointer/relocatable_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relocatable_pointer.hpp"
 
 namespace iox
 {
@@ -96,5 +96,5 @@ inline RelocatablePointer<T>::operator T*() const noexcept
 } // namespace rp
 } // namespace iox
 
-#endif // IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_PTR_INL
+#endif // IOX_UTILS_RELOCATABLE_POINTER_RELOCATABLE_POINTER_INL
 
diff --git a/iceoryx_utils/include/iceoryx_utils/posix_wrapper/semaphore.hpp b/iceoryx_utils/include/iceoryx_utils/posix_wrapper/semaphore.hpp
@@ -22,7 +22,7 @@
 #include "iceoryx_utils/cxx/smart_c.hpp"
 #include "iceoryx_utils/cxx/string.hpp"
 #include "iceoryx_utils/design_pattern/creation.hpp"
-#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp"
+#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp"
 #include "iceoryx_utils/internal/units/duration.hpp"
 #include "iceoryx_utils/platform/fcntl.hpp"
 #include "iceoryx_utils/platform/semaphore.hpp"