From eb6bf6f814b1f56527805500963aa2ed3c16bbf6 Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Tue, 20 Dec 2022 18:39:41 +0100 Subject: [PATCH] iox-#1391 Rename test files, add explicit includes and fix some typos Signed-off-by: Simon Hoinkis --- .../include/iceoryx_dust/posix_wrapper/named_pipe.hpp | 2 ++ .../include/iceoryx_dust/posix_wrapper/signal_watcher.hpp | 1 + iceoryx_hoofs/source/posix_wrapper/thread.cpp | 2 +- .../{test_cxx_expected.cpp => test_vocabulary_expected.cpp} | 0 .../{test_cxx_optional.cpp => test_vocabulary_optional.cpp} | 0 .../{test_cxx_string.cpp => test_vocabulary_string.cpp} | 0 .../{test_cxx_variant.cpp => test_vocabulary_variant.cpp} | 0 iceoryx_hoofs/vocabulary/include/iox/detail/string.inl | 6 +++--- .../include/iceoryx_posh/capro/service_description.hpp | 1 + .../include/iceoryx_posh/internal/mepoo/memory_manager.hpp | 1 + 10 files changed, 9 insertions(+), 4 deletions(-) rename iceoryx_hoofs/test/moduletests/{test_cxx_expected.cpp => test_vocabulary_expected.cpp} (100%) rename iceoryx_hoofs/test/moduletests/{test_cxx_optional.cpp => test_vocabulary_optional.cpp} (100%) rename iceoryx_hoofs/test/moduletests/{test_cxx_string.cpp => test_vocabulary_string.cpp} (100%) rename iceoryx_hoofs/test/moduletests/{test_cxx_variant.cpp => test_vocabulary_variant.cpp} (100%) diff --git a/iceoryx_dust/include/iceoryx_dust/posix_wrapper/named_pipe.hpp b/iceoryx_dust/include/iceoryx_dust/posix_wrapper/named_pipe.hpp index ed7603a533a..adad2d46785 100644 --- 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 index c999fcebeb3..5afc615b2d5 100644 --- 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 diff --git a/iceoryx_hoofs/source/posix_wrapper/thread.cpp b/iceoryx_hoofs/source/posix_wrapper/thread.cpp index f09fb15745d..6db657c19c8 100644 --- 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/iceoryx_hoofs/test/moduletests/test_cxx_expected.cpp b/iceoryx_hoofs/test/moduletests/test_vocabulary_expected.cpp similarity index 100% rename from iceoryx_hoofs/test/moduletests/test_cxx_expected.cpp rename to iceoryx_hoofs/test/moduletests/test_vocabulary_expected.cpp diff --git a/iceoryx_hoofs/test/moduletests/test_cxx_optional.cpp b/iceoryx_hoofs/test/moduletests/test_vocabulary_optional.cpp similarity index 100% rename from iceoryx_hoofs/test/moduletests/test_cxx_optional.cpp rename to iceoryx_hoofs/test/moduletests/test_vocabulary_optional.cpp diff --git a/iceoryx_hoofs/test/moduletests/test_cxx_string.cpp b/iceoryx_hoofs/test/moduletests/test_vocabulary_string.cpp similarity index 100% rename from iceoryx_hoofs/test/moduletests/test_cxx_string.cpp rename to iceoryx_hoofs/test/moduletests/test_vocabulary_string.cpp diff --git a/iceoryx_hoofs/test/moduletests/test_cxx_variant.cpp b/iceoryx_hoofs/test/moduletests/test_vocabulary_variant.cpp similarity index 100% rename from iceoryx_hoofs/test/moduletests/test_cxx_variant.cpp rename to iceoryx_hoofs/test/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 index f6a777fd170..1bdc93105b0 100644 --- 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 operator>=(const string& 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 index 9517c2ca60c..90190963fe2 100644 --- 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 diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/memory_manager.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/memory_manager.hpp index 0f323debc28..f80b2195ba9 100644 --- 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 #include