iox-#180 Move 'iox::span' into 'vocabulary' module

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
eclipse-iceoryx · Apr 14, 2023 · 13e4f47 · 13e4f47
1 parent 3e9e506
commit 13e4f47
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 253 deletions.
diff --git a/iceoryx_dust/BUILD.bazel b/iceoryx_dust/BUILD.bazel
@@ -22,8 +22,8 @@ cc_library(
         "source/**/*.cpp",
         "source/**/*.hpp",
     ]),
-    hdrs = glob(["include/**"]),
-    strip_include_prefix = "include",
+    hdrs = glob(["include/**"] + glob(["vocabulary/**"])),
+    includes = ["vocabulary/include/", "include"],
     visibility = ["//visibility:public"],
     deps = ["//iceoryx_hoofs"],
 )
diff --git a/iceoryx_dust/CMakeLists.txt b/iceoryx_dust/CMakeLists.txt
@@ -45,8 +45,10 @@ iox_add_library(
     PRIVATE_LIBS_LINUX          ${CODE_COVERAGE_LIBS}
     PUBLIC_LIBS                 iceoryx_hoofs::iceoryx_hoofs
     BUILD_INTERFACE             ${PROJECT_SOURCE_DIR}/include
+                                ${PROJECT_SOURCE_DIR}/vocabulary/include
     INSTALL_INTERFACE           include/${PREFIX}
     EXPORT_INCLUDE_DIRS         include/
+                                vocabulary/include/
     FILES
         source/cli/arguments.cpp
         source/cli/command_line_parser.cpp

diff --git a/iceoryx_dust/test/moduletests/test_cxx_span.cpp b/iceoryx_dust/test/moduletests/test_cxx_span.cpp
diff --git a/...test/moduletests/test_vocabulary_span.cpp → ...test/moduletests/test_vocabulary_span.cpp b/...test/moduletests/test_vocabulary_span.cpp → ...test/moduletests/test_vocabulary_span.cpp
@@ -14,8 +14,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "iceoryx_dust/cxx/span.hpp"
-#include "iceoryx_hoofs/cxx/vector.hpp"
+#include "iox/span.hpp"
+#include "iox/vector.hpp"
 #include "test.hpp"
 
 #include <vector>

diff --git a/...nclude/iceoryx_dust/internal/cxx/span.inl → ...st/vocabulary/include/iox/detail/span.inl b/...nclude/iceoryx_dust/internal/cxx/span.inl → ...st/vocabulary/include/iox/detail/span.inl
@@ -13,10 +13,10 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_DUST_CXX_SPAN_INL
-#define IOX_DUST_CXX_SPAN_INL
+#ifndef IOX_DUST_VOCABULARY_SPAN_INL
+#define IOX_DUST_VOCABULARY_SPAN_INL
 
-#include "iceoryx_dust/cxx/span.hpp"
+#include "iox/span.hpp"
 
 namespace iox
 {
@@ -290,4 +290,4 @@ constexpr auto make_span(Container&& container) noexcept
 
 } // namespace iox
 
-#endif  // IOX_DUST_CXX_SPAN_INL
+#endif  // IOX_DUST_VOCABULARY_SPAN_INL
diff --git a/...nclude/iceoryx_dust/cxx/span_iterator.hpp → ...lary/include/iox/detail/span_iterator.hpp b/...nclude/iceoryx_dust/cxx/span_iterator.hpp → ...lary/include/iox/detail/span_iterator.hpp
@@ -13,8 +13,8 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_DUST_CXX_SPAN_ITERATOR_HPP
-#define IOX_DUST_CXX_SPAN_ITERATOR_HPP
+#ifndef IOX_DUST_VOCABULARY_SPAN_ITERATOR_HPP
+#define IOX_DUST_VOCABULARY_SPAN_ITERATOR_HPP
 
 #include <iterator> // for reverse_iterator, distance, random_access_...
 
@@ -206,4 +206,4 @@ class span_iterator
 };
 } // namespace iox
 
-#endif // IOX_DUST_CXX_SPAN_ITERATOR_HPP
+#endif // IOX_DUST_VOCABULARY_SPAN_ITERATOR_HPP
diff --git a/...yx_dust/include/iceoryx_dust/cxx/span.hpp → iceoryx_dust/vocabulary/include/iox/span.hpp b/...yx_dust/include/iceoryx_dust/cxx/span.hpp → iceoryx_dust/vocabulary/include/iox/span.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_DUST_CXX_SPAN_HPP
-#define IOX_DUST_CXX_SPAN_HPP
+#ifndef IOX_DUST_VOCABULARY_SPAN_HPP
+#define IOX_DUST_VOCABULARY_SPAN_HPP
 
-#include "iceoryx_dust/cxx/span_iterator.hpp"
 #include "iceoryx_hoofs/cxx/requires.hpp"
 #include "iceoryx_hoofs/cxx/type_traits.hpp"
+#include "iox/detail/span_iterator.hpp"
 #include "iox/uninitialized_array.hpp"
 
 #include <algorithm>
@@ -430,6 +430,6 @@ class span : public internal::span_storage<Extent>
 
 } // namespace iox
 
-#include "iceoryx_dust/internal/cxx/span.inl"
+#include "iox/detail/span.inl"
 
-#endif // IOX_DUST_CXX_SPAN_HPP
+#endif // IOX_DUST_VOCABULARY_SPAN_HPP