From 0052d1bb9e89de40ec7879334000f503aa5ba4b3 Mon Sep 17 00:00:00 2001 From: Marika Lehmann Date: Wed, 24 Mar 2021 14:45:23 +0100 Subject: [PATCH] iox-#605 remove mutex (wrong merge resolution), rename files Signed-off-by: Marika Lehmann --- .../iceoryx_posh/internal/mepoo/chunk_management.hpp | 2 +- .../include/iceoryx_posh/internal/mepoo/mem_pool.hpp | 2 +- .../iceoryx_posh/internal/mepoo/mepoo_segment.inl | 2 +- .../iceoryx_posh/internal/mepoo/shared_chunk.hpp | 2 +- .../popo/building_blocks/chunk_distributor_data.hpp | 2 +- .../popo/building_blocks/chunk_queue_data.hpp | 2 +- .../popo/building_blocks/chunk_queue_types.hpp | 2 +- .../popo/building_blocks/chunk_sender_data.hpp | 2 +- .../internal/popo/ports/base_port_data.hpp | 2 +- .../internal/popo/ports/client_server_port_types.hpp | 2 +- .../iceoryx_posh/internal/popo/used_chunk_list.hpp | 2 +- .../iceoryx_posh/internal/roudi/process_manager.hpp | 2 -- .../include/iceoryx_posh/internal/roudi/roudi.hpp | 2 +- .../internal/runtime/ipc_interface_base.hpp | 2 +- .../internal/runtime/shared_memory_user.hpp | 2 +- iceoryx_posh/source/roudi/memory/memory_provider.cpp | 2 +- iceoryx_posh/source/roudi/process_manager.cpp | 2 +- iceoryx_posh/source/runtime/posh_runtime.cpp | 2 +- .../moduletests/test_mepoo_segment_management.cpp | 2 +- .../test/moduletests/test_mepoo_shared_pointer.cpp | 2 +- .../test/moduletests/test_roudi_memory_provider.cpp | 2 +- .../test/moduletests/test_roudi_portmanager.cpp | 2 +- iceoryx_utils/CMakeLists.txt | 4 ++-- .../iceoryx_utils/internal/concurrent/loffli.hpp | 2 +- ...catable_ptr.hpp => atomic_relocatable_pointer.hpp} | 8 ++++---- ...catable_ptr.inl => atomic_relocatable_pointer.inl} | 8 ++++---- ...ase_relative_ptr.hpp => base_relative_pointer.hpp} | 6 +++--- ...locatable_ptr.hpp => base_relocatable_pointer.hpp} | 7 ++++--- .../{relative_ptr.hpp => relative_pointer.hpp} | 11 ++++++----- .../{relative_ptr.inl => relative_pointer.inl} | 8 ++++---- .../{relocatable_ptr.hpp => relocatable_pointer.hpp} | 10 +++++----- .../{relocatable_ptr.inl => relocatable_pointer.inl} | 8 ++++---- .../include/iceoryx_utils/posix_wrapper/semaphore.hpp | 2 +- ...ase_relative_ptr.cpp => base_relative_pointer.cpp} | 2 +- ...locatable_ptr.cpp => base_relocatable_pointer.cpp} | 2 +- .../test/moduletests/test_atomic_relocatable_ptr.cpp | 2 +- .../test/moduletests/test_relative_pointer.cpp | 2 +- .../test/moduletests/test_relocatable_ptr.cpp | 2 +- 38 files changed, 64 insertions(+), 64 deletions(-) rename iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/{atomic_relocatable_ptr.hpp => atomic_relocatable_pointer.hpp} (93%) rename iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/{atomic_relocatable_ptr.inl => atomic_relocatable_pointer.inl} (90%) rename iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/{base_relative_ptr.hpp => base_relative_pointer.hpp} (97%) rename iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/{base_relocatable_ptr.hpp => base_relocatable_pointer.hpp} (95%) rename iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/{relative_ptr.hpp => relative_pointer.hpp} (93%) rename iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/{relative_ptr.inl => relative_pointer.inl} (91%) rename iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/{relocatable_ptr.hpp => relocatable_pointer.hpp} (92%) rename iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/{relocatable_ptr.inl => relocatable_pointer.inl} (92%) rename iceoryx_utils/source/relocatable_pointer/{base_relative_ptr.cpp => base_relative_pointer.cpp} (99%) rename iceoryx_utils/source/relocatable_pointer/{base_relocatable_ptr.cpp => base_relocatable_pointer.cpp} (99%) diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/chunk_management.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/chunk_management.hpp index 237ec15aec..aef1a34794 100644 --- 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 #include diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp index 62b0970ff6..19863efd05 100644 --- 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 #include diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl index 4ca67d7bf7..4432b7bb88 100644 --- 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 index bf5240cb2f..bf53d804b0 100644 --- 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 index f6fa423cc1..9b6aae7a50 100644 --- 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 #include 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 index d99bb10989..73ff915cf7 100644 --- 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 index 8c9f3ae337..f906518741 100644 --- 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 index 6fafbff6ed..16f9db6de9 100644 --- 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 index a237af8ab9..63080a8568 100644 --- 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 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 index 1c81e43999..131a34d1b5 100644 --- 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 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 index 805b7c2bde..f07975f514 100644 --- 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 #include diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/process_manager.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/process_manager.hpp index 1f33267fe0..6eee83f964 100644 --- 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 index d4f083642f..fbb08c37c6 100644 --- 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 index 61f862d8f9..0aab644168 100644 --- 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 index 7d790676b4..77a84d34c7 100644 --- 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 index c7a333f9d4..e339d63080 100644 --- 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 index 668eb336e3..cd84c2621b 100644 --- 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 index dfa5398d42..305b532cf7 100644 --- 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 diff --git a/iceoryx_posh/test/moduletests/test_mepoo_segment_management.cpp b/iceoryx_posh/test/moduletests/test_mepoo_segment_management.cpp index 6308a64437..35bc9c67a9 100644 --- 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 index d5a27c5f4e..ec186eb42d 100644 --- 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 index e0897bde88..eb269d2c25 100644 --- 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 index 95f716df49..db6efbe36b 100644 --- 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 diff --git a/iceoryx_utils/CMakeLists.txt b/iceoryx_utils/CMakeLists.txt index ea84aba167..ca5f0ede8e 100644 --- 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 index db48021492..de64b6f810 100644 --- 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 #include diff --git a/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_ptr.hpp b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_pointer.hpp similarity index 93% rename from iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_ptr.hpp rename to iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_pointer.hpp index 01613c418b..5f461eb0c6 100644 --- a/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_ptr.hpp +++ b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_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 #include @@ -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/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_ptr.inl b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_pointer.inl similarity index 90% rename from iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_ptr.inl rename to iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_pointer.inl index e174a4329b..716f8c204f 100644 --- a/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_ptr.inl +++ b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_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::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/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relative_pointer.hpp similarity index 97% rename from iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp rename to iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relative_pointer.hpp index 2eca7bc3c2..9ad88e50c3 100644 --- a/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relative_ptr.hpp +++ b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_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/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relocatable_ptr.hpp b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relocatable_pointer.hpp similarity index 95% rename from iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relocatable_ptr.hpp rename to iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relocatable_pointer.hpp index 4320a0760c..dd9b5805ba 100644 --- a/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/base_relocatable_ptr.hpp +++ b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_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 #include @@ -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/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp similarity index 93% rename from iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp rename to iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp index 8bffd11d41..39a3aeafe5 100644 --- a/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp +++ b/iceoryx_utils/include/iceoryx_utils/internal/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 #include @@ -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/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_ptr.inl b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_pointer.inl similarity index 91% rename from iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_ptr.inl rename to iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_pointer.inl index 083a4532f5..8473505a01 100644 --- a/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relative_ptr.inl +++ b/iceoryx_utils/include/iceoryx_utils/internal/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::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/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_ptr.hpp b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_pointer.hpp similarity index 92% rename from iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_ptr.hpp rename to iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_pointer.hpp index 37f2807aeb..b3f7eba748 100644 --- a/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_ptr.hpp +++ b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_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/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_ptr.inl b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_pointer.inl similarity index 92% rename from iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_ptr.inl rename to iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_pointer.inl index 2b7c49264e..58641a6b9f 100644 --- a/iceoryx_utils/include/iceoryx_utils/internal/relocatable_pointer/relocatable_ptr.inl +++ b/iceoryx_utils/include/iceoryx_utils/internal/relocatable_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::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 index 28d181287e..bfc1e67bfa 100644 --- 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" diff --git a/iceoryx_utils/source/relocatable_pointer/base_relative_ptr.cpp b/iceoryx_utils/source/relocatable_pointer/base_relative_pointer.cpp similarity index 99% rename from iceoryx_utils/source/relocatable_pointer/base_relative_ptr.cpp rename to iceoryx_utils/source/relocatable_pointer/base_relative_pointer.cpp index d815cde5a6..5450706cfb 100644 --- a/iceoryx_utils/source/relocatable_pointer/base_relative_ptr.cpp +++ b/iceoryx_utils/source/relocatable_pointer/base_relative_pointer.cpp @@ -15,7 +15,7 @@ // // SPDX-License-Identifier: Apache-2.0 -#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_utils/source/relocatable_pointer/base_relocatable_ptr.cpp b/iceoryx_utils/source/relocatable_pointer/base_relocatable_pointer.cpp similarity index 99% rename from iceoryx_utils/source/relocatable_pointer/base_relocatable_ptr.cpp rename to iceoryx_utils/source/relocatable_pointer/base_relocatable_pointer.cpp index e88ec7b655..7bd9f8e573 100644 --- a/iceoryx_utils/source/relocatable_pointer/base_relocatable_ptr.cpp +++ b/iceoryx_utils/source/relocatable_pointer/base_relocatable_pointer.cpp @@ -15,7 +15,7 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "iceoryx_utils/internal/relocatable_pointer/base_relocatable_ptr.hpp" +#include "iceoryx_utils/internal/relocatable_pointer/base_relocatable_pointer.hpp" namespace iox { diff --git a/iceoryx_utils/test/moduletests/test_atomic_relocatable_ptr.cpp b/iceoryx_utils/test/moduletests/test_atomic_relocatable_ptr.cpp index 0e16a77850..c1b3f412c6 100644 --- a/iceoryx_utils/test/moduletests/test_atomic_relocatable_ptr.cpp +++ b/iceoryx_utils/test/moduletests/test_atomic_relocatable_ptr.cpp @@ -14,7 +14,7 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_ptr.hpp" +#include "iceoryx_utils/internal/relocatable_pointer/atomic_relocatable_pointer.hpp" #include "test.hpp" diff --git a/iceoryx_utils/test/moduletests/test_relative_pointer.cpp b/iceoryx_utils/test/moduletests/test_relative_pointer.cpp index d3b4b30b47..4cd4bb8eab 100644 --- a/iceoryx_utils/test/moduletests/test_relative_pointer.cpp +++ b/iceoryx_utils/test/moduletests/test_relative_pointer.cpp @@ -16,7 +16,7 @@ // SPDX-License-Identifier: Apache-2.0 #include "iceoryx_utils/cxx/smart_c.hpp" -#include "iceoryx_utils/internal/relocatable_pointer/relative_ptr.hpp" +#include "iceoryx_utils/internal/relocatable_pointer/relative_pointer.hpp" #include "iceoryx_utils/platform/fcntl.hpp" #include "iceoryx_utils/platform/mman.hpp" #include "iceoryx_utils/platform/stat.hpp" diff --git a/iceoryx_utils/test/moduletests/test_relocatable_ptr.cpp b/iceoryx_utils/test/moduletests/test_relocatable_ptr.cpp index 660bc602b7..6aa6467981 100644 --- a/iceoryx_utils/test/moduletests/test_relocatable_ptr.cpp +++ b/iceoryx_utils/test/moduletests/test_relocatable_ptr.cpp @@ -15,7 +15,7 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "iceoryx_utils/internal/relocatable_pointer/relocatable_ptr.hpp" +#include "iceoryx_utils/internal/relocatable_pointer/relocatable_pointer.hpp" #include "test.hpp"