Merge pull request #2132 from elBoberido/iox-2130-move-convert-to-hoofs

iox-#2130 Move 'convert' to 'iceoryx_hoofs'
eclipse-iceoryx · Dec 9, 2023 · 79f038b · 79f038b
2 parents 3ffb6b3 + 59f6ccd
commit 79f038b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git 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)

diff --git a/...test/moduletests/test_utility_convert.cpp → ...test/moduletests/test_utility_convert.cpp b/...test/moduletests/test_utility_convert.cpp → ...test/moduletests/test_utility_convert.cpp
diff --git a/...st/utility/include/iox/detail/convert.hpp → ...fs/utility/include/iox/detail/convert.hpp b/...st/utility/include/iox/detail/convert.hpp → ...fs/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/...st/utility/include/iox/detail/convert.inl → ...fs/utility/include/iox/detail/convert.inl b/...st/utility/include/iox/detail/convert.inl → ...fs/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<bool>(const char* v, bool& dest) noexcept
 
 } // namespace iox
 
-#endif // IOX_DUST_CXX_CONVERT_INL
+#endif // IOX_HOOFS_UTILITY_CONVERT_INL