iox-#1391 Rename test files, add explicit includes and fix some typos

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
eclipse-iceoryx · Dec 20, 2022 · eb6bf6f · eb6bf6f
1 parent 48f45f1
commit eb6bf6f
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 4 deletions.
diff --git a/iceoryx_dust/include/iceoryx_dust/posix_wrapper/named_pipe.hpp b/iceoryx_dust/include/iceoryx_dust/posix_wrapper/named_pipe.hpp
@@ -23,6 +23,8 @@
 #include "iceoryx_hoofs/internal/units/duration.hpp"
 #include "iceoryx_hoofs/posix_wrapper/unnamed_semaphore.hpp"
 #include "iceoryx_platform/semaphore.hpp"
+#include "iox/expected.hpp"
+#include "iox/optional.hpp"
 #include "iox/string.hpp"
 #include "iox/uninitialized_array.hpp"
 

diff --git a/iceoryx_dust/include/iceoryx_dust/posix_wrapper/signal_watcher.hpp b/iceoryx_dust/include/iceoryx_dust/posix_wrapper/signal_watcher.hpp
@@ -18,6 +18,7 @@
 
 #include "iceoryx_hoofs/posix_wrapper/signal_handler.hpp"
 #include "iceoryx_hoofs/posix_wrapper/unnamed_semaphore.hpp"
+#include "iox/optional.hpp"
 
 #include <atomic>
 

diff --git a/iceoryx_hoofs/source/posix_wrapper/thread.cpp b/iceoryx_hoofs/source/posix_wrapper/thread.cpp
@@ -25,7 +25,7 @@ namespace posix
 void setThreadName(iox_pthread_t thread, const ThreadName_t& name) noexcept
 {
     posixCall(iox_pthread_setname_np)(thread, name.c_str()).successReturnValue(0).evaluate().or_else([](auto& r) {
-        // String length limit is ensured through string
+        // String length limit is ensured through iox::string
         // ERANGE (string too long) intentionally not handled to avoid untestable and dead code
         IOX_LOG(ERROR) << "This should never happen! " << r.getHumanReadableErrnum();
         cxx::Ensures(false && "internal logic error");

diff --git a/...fs/test/moduletests/test_cxx_expected.cpp → .../moduletests/test_vocabulary_expected.cpp b/...fs/test/moduletests/test_cxx_expected.cpp → .../moduletests/test_vocabulary_expected.cpp
diff --git a/...fs/test/moduletests/test_cxx_optional.cpp → .../moduletests/test_vocabulary_optional.cpp b/...fs/test/moduletests/test_cxx_optional.cpp → .../moduletests/test_vocabulary_optional.cpp
diff --git a/...oofs/test/moduletests/test_cxx_string.cpp → ...st/moduletests/test_vocabulary_string.cpp b/...oofs/test/moduletests/test_cxx_string.cpp → ...st/moduletests/test_vocabulary_string.cpp
diff --git a/...ofs/test/moduletests/test_cxx_variant.cpp → ...t/moduletests/test_vocabulary_variant.cpp b/...ofs/test/moduletests/test_cxx_variant.cpp → ...t/moduletests/test_vocabulary_variant.cpp
diff --git a/iceoryx_hoofs/vocabulary/include/iox/detail/string.inl b/iceoryx_hoofs/vocabulary/include/iox/detail/string.inl
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_STRING_INL
-#define IOX_HOOFS_CXX_STRING_INL
+#ifndef IOX_HOOFS_VOCABULARY_STRING_INL
+#define IOX_HOOFS_VOCABULARY_STRING_INL
 
 #include "iox/string.hpp"
 
@@ -672,4 +672,4 @@ inline IsStringOrCharArrayOrChar<T, bool> operator>=(const string<Capacity>& lhs
 // AXIVION ENABLE Style AutosarC++19_03-A13.5.5
 } // namespace iox
 
-#endif // IOX_HOOFS_CXX_STRING_INL
+#endif // IOX_HOOFS_VOCABULARY_STRING_INL
diff --git a/iceoryx_posh/include/iceoryx_posh/capro/service_description.hpp b/iceoryx_posh/include/iceoryx_posh/capro/service_description.hpp
@@ -21,6 +21,7 @@
 #include "iceoryx_hoofs/cxx/vector.hpp"
 #include "iceoryx_hoofs/log/logstream.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
+#include "iox/expected.hpp"
 #include "iox/string.hpp"
 
 #include <cstdint>

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/memory_manager.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/memory_manager.hpp
@@ -23,6 +23,7 @@
 #include "iceoryx_posh/internal/mepoo/mem_pool.hpp"
 #include "iceoryx_posh/internal/mepoo/shared_chunk.hpp"
 #include "iceoryx_posh/mepoo/chunk_settings.hpp"
+#include "iox/expected.hpp"
 
 #include <cstdint>
 #include <limits>