Skip to content

Commit 79f038b

Browse files
authored
Merge pull request #2132 from elBoberido/iox-2130-move-convert-to-hoofs
iox-#2130 Move 'convert' to 'iceoryx_hoofs'
2 parents 3ffb6b3 + 59f6ccd commit 79f038b

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

iceoryx_binding_c/test/moduletests/test_publisher.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -452,14 +452,8 @@ TEST(iox_pub_options_test, publisherOptionsInitializationCheckReturnsFalseWithou
452452
{
453453
::testing::Test::RecordProperty("TEST_ID", "f3c7c69e-6946-4da4-9c9e-93129cae9d61");
454454
iox_pub_options_t sut;
455-
#if (defined(__GNUC__) && __GNUC__ >= 7 && !defined(__clang__))
456-
#pragma GCC diagnostic push
457-
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
458-
#endif
455+
memset(&sut, 0, sizeof(sut));
459456
EXPECT_FALSE(iox_pub_options_is_initialized(&sut));
460-
#if (defined(__GNUC__) && __GNUC__ >= 7 && !defined(__clang__))
461-
#pragma GCC diagnostic pop
462-
#endif
463457
}
464458

465459
TEST(iox_pub_options_test, publisherOptionInitializationWithNullptrDoesNotCrash)

iceoryx_dust/utility/include/iox/detail/convert.hpp renamed to iceoryx_hoofs/utility/include/iox/detail/convert.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
//
1717
// SPDX-License-Identifier: Apache-2.0
1818

19-
#ifndef IOX_DUST_UTILITY_CONVERT_HPP
20-
#define IOX_DUST_UTILITY_CONVERT_HPP
19+
#ifndef IOX_HOOFS_UTILITY_CONVERT_HPP
20+
#define IOX_HOOFS_UTILITY_CONVERT_HPP
2121

2222
#include "iox/posix_call.hpp"
2323
#include "iox/string.hpp"
@@ -105,4 +105,4 @@ class convert
105105

106106
#include "iox/detail/convert.inl"
107107

108-
#endif // IOX_DUST_UTILITY_CONVERT_HPP
108+
#endif // IOX_HOOFS_UTILITY_CONVERT_HPP

iceoryx_dust/utility/include/iox/detail/convert.inl renamed to iceoryx_hoofs/utility/include/iox/detail/convert.inl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
// limitations under the License.
1616
//
1717
// SPDX-License-Identifier: Apache-2.0
18-
#ifndef IOX_DUST_CXX_CONVERT_INL
19-
#define IOX_DUST_CXX_CONVERT_INL
18+
19+
#ifndef IOX_HOOFS_UTILITY_CONVERT_INL
20+
#define IOX_HOOFS_UTILITY_CONVERT_INL
2021

2122
#include "iox/detail/convert.hpp"
2223
#include "iox/logging.hpp"
@@ -439,4 +440,4 @@ inline bool convert::fromString<bool>(const char* v, bool& dest) noexcept
439440

440441
} // namespace iox
441442

442-
#endif // IOX_DUST_CXX_CONVERT_INL
443+
#endif // IOX_HOOFS_UTILITY_CONVERT_INL

0 commit comments

Comments
 (0)