From e3fdb93423bc39324c131faa494ac129c15770f1 Mon Sep 17 00:00:00 2001 From: Mathias Kraus Date: Fri, 8 Dec 2023 19:20:15 +0100 Subject: [PATCH 1/2] iox-#2130 Move 'convert' to 'iceoryx_hoofs' --- .../test/moduletests/test_utility_convert.cpp | 0 .../utility/include/iox/detail/convert.hpp | 6 +++--- .../utility/include/iox/detail/convert.inl | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) rename {iceoryx_dust => iceoryx_hoofs}/test/moduletests/test_utility_convert.cpp (100%) rename {iceoryx_dust => iceoryx_hoofs}/utility/include/iox/detail/convert.hpp (97%) rename {iceoryx_dust => iceoryx_hoofs}/utility/include/iox/detail/convert.inl (99%) diff --git a/iceoryx_dust/test/moduletests/test_utility_convert.cpp b/iceoryx_hoofs/test/moduletests/test_utility_convert.cpp similarity index 100% rename from iceoryx_dust/test/moduletests/test_utility_convert.cpp rename to iceoryx_hoofs/test/moduletests/test_utility_convert.cpp diff --git a/iceoryx_dust/utility/include/iox/detail/convert.hpp b/iceoryx_hoofs/utility/include/iox/detail/convert.hpp similarity index 97% rename from iceoryx_dust/utility/include/iox/detail/convert.hpp rename to iceoryx_hoofs/utility/include/iox/detail/convert.hpp index f603b8035f..faf2053b81 100644 --- a/iceoryx_dust/utility/include/iox/detail/convert.hpp +++ b/iceoryx_hoofs/utility/include/iox/detail/convert.hpp @@ -16,8 +16,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#ifndef IOX_DUST_UTILITY_CONVERT_HPP -#define IOX_DUST_UTILITY_CONVERT_HPP +#ifndef IOX_HOOFS_UTILITY_CONVERT_HPP +#define IOX_HOOFS_UTILITY_CONVERT_HPP #include "iox/posix_call.hpp" #include "iox/string.hpp" @@ -105,4 +105,4 @@ class convert #include "iox/detail/convert.inl" -#endif // IOX_DUST_UTILITY_CONVERT_HPP +#endif // IOX_HOOFS_UTILITY_CONVERT_HPP diff --git a/iceoryx_dust/utility/include/iox/detail/convert.inl b/iceoryx_hoofs/utility/include/iox/detail/convert.inl similarity index 99% rename from iceoryx_dust/utility/include/iox/detail/convert.inl rename to iceoryx_hoofs/utility/include/iox/detail/convert.inl index aaa002cde3..f2463f5cca 100644 --- a/iceoryx_dust/utility/include/iox/detail/convert.inl +++ b/iceoryx_hoofs/utility/include/iox/detail/convert.inl @@ -15,8 +15,9 @@ // limitations under the License. // // SPDX-License-Identifier: Apache-2.0 -#ifndef IOX_DUST_CXX_CONVERT_INL -#define IOX_DUST_CXX_CONVERT_INL + +#ifndef IOX_HOOFS_UTILITY_CONVERT_INL +#define IOX_HOOFS_UTILITY_CONVERT_INL #include "iox/detail/convert.hpp" #include "iox/logging.hpp" @@ -439,4 +440,4 @@ inline bool convert::fromString(const char* v, bool& dest) noexcept } // namespace iox -#endif // IOX_DUST_CXX_CONVERT_INL +#endif // IOX_HOOFS_UTILITY_CONVERT_INL From 59f6ccdbacb3fc4cbbc8b6c970492e98f48fecbf Mon Sep 17 00:00:00 2001 From: Mathias Kraus Date: Fri, 8 Dec 2023 19:30:16 +0100 Subject: [PATCH 2/2] iox-#2130 Fix binding-C publisher options test --- iceoryx_binding_c/test/moduletests/test_publisher.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/iceoryx_binding_c/test/moduletests/test_publisher.cpp b/iceoryx_binding_c/test/moduletests/test_publisher.cpp index 4e4551cba5..254af0008b 100644 --- a/iceoryx_binding_c/test/moduletests/test_publisher.cpp +++ b/iceoryx_binding_c/test/moduletests/test_publisher.cpp @@ -452,14 +452,8 @@ TEST(iox_pub_options_test, publisherOptionsInitializationCheckReturnsFalseWithou { ::testing::Test::RecordProperty("TEST_ID", "f3c7c69e-6946-4da4-9c9e-93129cae9d61"); iox_pub_options_t sut; -#if (defined(__GNUC__) && __GNUC__ >= 7 && !defined(__clang__)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" -#endif + memset(&sut, 0, sizeof(sut)); EXPECT_FALSE(iox_pub_options_is_initialized(&sut)); -#if (defined(__GNUC__) && __GNUC__ >= 7 && !defined(__clang__)) -#pragma GCC diagnostic pop -#endif } TEST(iox_pub_options_test, publisherOptionInitializationWithNullptrDoesNotCrash)