From 42742b82a652983d10cd9979881942f6a19039a9 Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Wed, 5 Oct 2022 14:48:13 +0200 Subject: [PATCH] iox-#605 Move RelativePointer from internal to public include directory Signed-off-by: Simon Hoinkis --- .../include/iceoryx_hoofs/internal/concurrent/loffli.hpp | 2 +- .../iceoryx_hoofs/{internal => }/memory/relative_pointer.hpp | 2 +- .../iceoryx_hoofs/{internal => }/memory/relative_pointer.inl | 2 +- iceoryx_hoofs/test/moduletests/test_relative_pointer.cpp | 2 +- .../include/iceoryx_posh/internal/mepoo/chunk_management.hpp | 2 +- iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp | 2 +- .../include/iceoryx_posh/internal/mepoo/mepoo_segment.inl | 2 +- .../include/iceoryx_posh/internal/mepoo/shared_chunk.hpp | 2 +- .../internal/popo/building_blocks/chunk_distributor_data.hpp | 2 +- .../internal/popo/building_blocks/chunk_queue_data.hpp | 2 +- .../include/iceoryx_posh/internal/popo/ports/base_port_data.hpp | 2 +- iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp | 2 +- .../iceoryx_posh/internal/runtime/ipc_interface_base.hpp | 2 +- .../iceoryx_posh/internal/runtime/shared_memory_user.hpp | 2 +- iceoryx_posh/source/mepoo/shared_chunk.cpp | 2 +- iceoryx_posh/source/roudi/memory/memory_provider.cpp | 2 +- iceoryx_posh/source/roudi/process_manager.cpp | 2 +- iceoryx_posh/test/moduletests/test_roudi_memory_provider.cpp | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename iceoryx_hoofs/include/iceoryx_hoofs/{internal => }/memory/relative_pointer.hpp (99%) rename iceoryx_hoofs/include/iceoryx_hoofs/{internal => }/memory/relative_pointer.inl (99%) diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/concurrent/loffli.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/internal/concurrent/loffli.hpp index 3aeef10c95e..6ea6f2d137b 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/concurrent/loffli.hpp +++ b/iceoryx_hoofs/include/iceoryx_hoofs/internal/concurrent/loffli.hpp @@ -18,7 +18,7 @@ #define IOX_HOOFS_CONCURRENT_LOFFLI_HPP #include "iceoryx_hoofs/cxx/helplets.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include #include diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/memory/relative_pointer.hpp similarity index 99% rename from iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.hpp rename to iceoryx_hoofs/include/iceoryx_hoofs/memory/relative_pointer.hpp index d34d3ec4422..aa573c5f054 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.hpp +++ b/iceoryx_hoofs/include/iceoryx_hoofs/memory/relative_pointer.hpp @@ -211,6 +211,6 @@ PointerRepository& getRe } // namespace memory } // namespace iox -#include "iceoryx_hoofs/internal/memory/relative_pointer.inl" +#include "iceoryx_hoofs/memory/relative_pointer.inl" #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/memory/relative_pointer.inl similarity index 99% rename from iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.inl rename to iceoryx_hoofs/include/iceoryx_hoofs/memory/relative_pointer.inl index 33781362cd1..c74be340685 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/memory/relative_pointer.inl +++ b/iceoryx_hoofs/include/iceoryx_hoofs/memory/relative_pointer.inl @@ -18,7 +18,7 @@ #ifndef IOX_HOOFS_MEMORY_RELATIVE_POINTER_INL #define IOX_HOOFS_MEMORY_RELATIVE_POINTER_INL -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" namespace iox { diff --git a/iceoryx_hoofs/test/moduletests/test_relative_pointer.cpp b/iceoryx_hoofs/test/moduletests/test_relative_pointer.cpp index 1f181b9d1f8..984f9638b4a 100644 --- a/iceoryx_hoofs/test/moduletests/test_relative_pointer.cpp +++ b/iceoryx_hoofs/test/moduletests/test_relative_pointer.cpp @@ -15,7 +15,7 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "test.hpp" 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 d0496695f39..dec5c048c8a 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_hoofs/cxx/helplets.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/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 11c906f060d..15731dc4e93 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp @@ -19,7 +19,7 @@ #include "iceoryx_hoofs/cxx/helplets.hpp" #include "iceoryx_hoofs/internal/concurrent/loffli.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_hoofs/internal/posix_wrapper/shared_memory_object/allocator.hpp" #include "iceoryx_posh/mepoo/chunk_header.hpp" 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 e296b7bc37c..f73abc9bdc0 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl @@ -17,7 +17,7 @@ #ifndef IOX_POSH_MEPOO_MEPOO_SEGMENT_INL #define IOX_POSH_MEPOO_MEPOO_SEGMENT_INL -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_posh/error_handling/error_handling.hpp" #include "iceoryx_posh/internal/log/posh_logging.hpp" #include "iceoryx_posh/internal/mepoo/mepoo_segment.hpp" 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 c36fdce3bce..81f4758e291 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/shared_chunk.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/shared_chunk.hpp @@ -17,7 +17,7 @@ #ifndef IOX_POSH_MEPOO_SHARED_CHUNK_HPP #define IOX_POSH_MEPOO_SHARED_CHUNK_HPP -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_posh/internal/mepoo/chunk_management.hpp" #include "iceoryx_posh/internal/mepoo/mem_pool.hpp" #include "iceoryx_posh/mepoo/chunk_header.hpp" 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 26f6f84cabd..7306f17071f 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 @@ -19,7 +19,7 @@ #include "iceoryx_hoofs/cxx/algorithm.hpp" #include "iceoryx_hoofs/cxx/vector.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_hoofs/internal/posix_wrapper/mutex.hpp" #include "iceoryx_posh/error_handling/error_handling.hpp" #include "iceoryx_posh/iceoryx_posh_types.hpp" 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 f4d2b97aed8..d2c412779eb 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 @@ -19,7 +19,7 @@ #include "iceoryx_hoofs/cxx/variant_queue.hpp" #include "iceoryx_hoofs/internal/cxx/unique_id.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_posh/iceoryx_posh_types.hpp" #include "iceoryx_posh/internal/mepoo/shm_safe_unmanaged_chunk.hpp" #include "iceoryx_posh/internal/popo/building_blocks/condition_notifier.hpp" 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 a98c4e39530..7a86bc127c9 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 @@ -17,7 +17,7 @@ #ifndef IOX_POSH_POPO_PORTS_BASE_PORT_DATA_HPP #define IOX_POSH_POPO_PORTS_BASE_PORT_DATA_HPP -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_posh/capro/service_description.hpp" #include "iceoryx_posh/iceoryx_posh_types.hpp" #include "iceoryx_posh/internal/capro/capro_message.hpp" diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp index 83435cca7aa..5163464e2ec 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp @@ -19,7 +19,7 @@ #include "iceoryx_hoofs/cxx/scope_guard.hpp" #include "iceoryx_hoofs/internal/concurrent/smart_lock.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_hoofs/posix_wrapper/posix_access_rights.hpp" #include "iceoryx_platform/file.hpp" #include "iceoryx_posh/iceoryx_posh_types.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 a9026c6253e..1302827657e 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 @@ -20,7 +20,7 @@ #include "iceoryx_hoofs/cxx/deadline_timer.hpp" #include "iceoryx_hoofs/cxx/optional.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_hoofs/internal/units/duration.hpp" #include "iceoryx_platform/errno.hpp" #include "iceoryx_platform/fcntl.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 d068857c5e0..989706c47c2 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 @@ -19,7 +19,7 @@ #include "iceoryx_hoofs/cxx/optional.hpp" #include "iceoryx_hoofs/cxx/vector.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_hoofs/internal/posix_wrapper/shared_memory_object.hpp" #include "iceoryx_posh/iceoryx_posh_types.hpp" diff --git a/iceoryx_posh/source/mepoo/shared_chunk.cpp b/iceoryx_posh/source/mepoo/shared_chunk.cpp index f96435d8a97..26d5beb66f7 100644 --- a/iceoryx_posh/source/mepoo/shared_chunk.cpp +++ b/iceoryx_posh/source/mepoo/shared_chunk.cpp @@ -16,7 +16,7 @@ // SPDX-License-Identifier: Apache-2.0 #include "iceoryx_posh/internal/mepoo/shared_chunk.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/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 400085e2373..fd3cefb0d82 100644 --- a/iceoryx_posh/source/roudi/memory/memory_provider.cpp +++ b/iceoryx_posh/source/roudi/memory/memory_provider.cpp @@ -17,7 +17,7 @@ #include "iceoryx_posh/roudi/memory/memory_provider.hpp" #include "iceoryx_hoofs/cxx/helplets.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_posh/error_handling/error_handling.hpp" #include "iceoryx_posh/internal/log/posh_logging.hpp" #include "iceoryx_posh/roudi/memory/memory_block.hpp" diff --git a/iceoryx_posh/source/roudi/process_manager.cpp b/iceoryx_posh/source/roudi/process_manager.cpp index 3db50dea55b..2f273fb1d42 100644 --- a/iceoryx_posh/source/roudi/process_manager.cpp +++ b/iceoryx_posh/source/roudi/process_manager.cpp @@ -19,7 +19,7 @@ #include "iceoryx_hoofs/cxx/convert.hpp" #include "iceoryx_hoofs/cxx/deadline_timer.hpp" #include "iceoryx_hoofs/cxx/vector.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "iceoryx_hoofs/posix_wrapper/posix_call.hpp" #include "iceoryx_platform/signal.hpp" #include "iceoryx_platform/types.hpp" diff --git a/iceoryx_posh/test/moduletests/test_roudi_memory_provider.cpp b/iceoryx_posh/test/moduletests/test_roudi_memory_provider.cpp index f380133a5de..49422704068 100644 --- a/iceoryx_posh/test/moduletests/test_roudi_memory_provider.cpp +++ b/iceoryx_posh/test/moduletests/test_roudi_memory_provider.cpp @@ -17,7 +17,7 @@ #include "iceoryx_posh/roudi/memory/memory_provider.hpp" -#include "iceoryx_hoofs/internal/memory/relative_pointer.hpp" +#include "iceoryx_hoofs/memory/relative_pointer.hpp" #include "mocks/roudi_memory_block_mock.hpp" #include "mocks/roudi_memory_provider_mock.hpp"