Merge pull request #2063 from eclipse-iceoryx/iox-1391-move-dust-head…

…er-from-legacy-path-to-module-path-part-2 iox-#1391 Move dust header from legacy path to module path part 2
eclipse-iceoryx · Nov 3, 2023 · 65641c7 · 65641c7
2 parents eea74bd + 8316651
commit 65641c7
Show file tree

Hide file tree

Showing 61 changed files with 420 additions and 415 deletions.
diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md
@@ -1020,15 +1020,15 @@
     #include "iceoryx_hoofs/cxx/serialization.hpp"
 
     // after
-    #include "iceoryx_dust/cxx/serialization.hpp"
+    #include "iox/detail/serialization.hpp"
     ```
 
     ```cpp
     // before
     #include "iceoryx_hoofs/cxx/convert.hpp"
 
     // after
-    #include "iceoryx_dust/cxx/convert.hpp"
+    #include "iox/detail/convert.hpp"
     ```
 
 43. Move the conversions functions for `std::string` to `iceoryx_dust`:

diff --git a/iceoryx_dust/BUILD.bazel b/iceoryx_dust/BUILD.bazel
@@ -20,7 +20,7 @@ load("//bazel:configure_file.bzl", "configure_file")
 configure_file(
     name = "iceoryx_dust_deployment_hpp",
     src = "cmake/iceoryx_dust_deployment.hpp.in",
-    out = "include/iceoryx_dust/iceoryx_dust_deployment.hpp",
+    out = "include/iox/iceoryx_dust_deployment.hpp",
     config = {
         "IOX_MAX_NAMED_PIPE_MESSAGE_SIZE": "4096",
         "IOX_MAX_NAMED_PIPE_NUMBER_OF_MESSAGES": "10",

diff --git a/iceoryx_dust/CMakeLists.txt b/iceoryx_dust/CMakeLists.txt
@@ -75,11 +75,11 @@ iox_add_library(
 )
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/iceoryx_dust_deployment.hpp.in"
-  "${CMAKE_BINARY_DIR}/generated/iceoryx_dust/include/iceoryx_dust/iceoryx_dust_deployment.hpp" @ONLY)
+  "${CMAKE_BINARY_DIR}/generated/iceoryx_dust/include/iox/iceoryx_dust_deployment.hpp" @ONLY)
 
 install(
-    FILES ${CMAKE_BINARY_DIR}/generated/iceoryx_dust/include/${PROJECT_NAME}/iceoryx_dust_deployment.hpp
-    DESTINATION include/${PREFIX}/${PROJECT_NAME}/
+    FILES ${CMAKE_BINARY_DIR}/generated/iceoryx_dust/include/iox/iceoryx_dust_deployment.hpp
+    DESTINATION include/${PREFIX}/iox/
     COMPONENT dev
 )
 

diff --git a/iceoryx_dust/cli/include/iox/cli/arguments.hpp b/iceoryx_dust/cli/include/iox/cli/arguments.hpp
@@ -16,9 +16,9 @@
 #ifndef IOX_DUST_CLI_ARGUMENTS_HPP
 #define IOX_DUST_CLI_ARGUMENTS_HPP
 
-#include "iceoryx_dust/cxx/convert.hpp"
 #include "iox/cli/option.hpp"
 #include "iox/cli/types.hpp"
+#include "iox/detail/convert.hpp"
 #include "iox/expected.hpp"
 #include "iox/vector.hpp"
 

diff --git a/iceoryx_dust/cli/include/iox/cli/arguments.inl b/iceoryx_dust/cli/include/iox/cli/arguments.inl
@@ -27,7 +27,7 @@ template <typename T>
 inline expected<T, Arguments::Error> Arguments::convertFromString(const Argument_t& stringValue) const noexcept
 {
     T value;
-    if (!cxx::convert::fromString(stringValue.c_str(), value))
+    if (!convert::fromString(stringValue.c_str(), value))
     {
         std::cout << "\"" << stringValue.c_str() << "\" could not be converted to the requested type" << std::endl;
         return err(Error::UNABLE_TO_CONVERT_VALUE);

diff --git a/iceoryx_dust/cli/include/iox/cli/option_manager.inl b/iceoryx_dust/cli/include/iox/cli/option_manager.inl
@@ -60,7 +60,7 @@ inline T OptionManager::defineOption(T& referenceToMember,
 {
     constexpr bool IS_NO_SWITCH = false;
     m_optionSet.addOption(OptionWithDetails{
-        {shortName, IS_NO_SWITCH, name, into<lossy<Argument_t>>(cxx::convert::toString(defaultArgumentValue))},
+        {shortName, IS_NO_SWITCH, name, into<lossy<Argument_t>>(convert::toString(defaultArgumentValue))},
         description,
         optionType,
         {TypeInfo<T>::NAME}});

diff --git a/iceoryx_dust/include/iceoryx_dust/posix_wrapper/named_pipe.hpp b/iceoryx_dust/include/iceoryx_dust/posix_wrapper/named_pipe.hpp
@@ -17,7 +17,6 @@
 #ifndef IOX_DUST_POSIX_WRAPPER_NAMED_PIPE_HPP
 #define IOX_DUST_POSIX_WRAPPER_NAMED_PIPE_HPP
 
-#include "iceoryx_dust/iceoryx_dust_deployment.hpp"
 #include "iceoryx_hoofs/concurrent/lockfree_queue.hpp"
 #include "iceoryx_hoofs/internal/posix_wrapper/ipc_channel.hpp"
 #include "iceoryx_hoofs/internal/posix_wrapper/shared_memory_object.hpp"
@@ -26,6 +25,7 @@
 #include "iox/builder.hpp"
 #include "iox/duration.hpp"
 #include "iox/expected.hpp"
+#include "iox/iceoryx_dust_deployment.hpp"
 #include "iox/optional.hpp"
 #include "iox/string.hpp"
 #include "iox/uninitialized_array.hpp"