Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

iox-#2414 Reset index after move construction #2413

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −14
Open

iox-#2414 Reset index after move construction #2413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/website/release-notes/iceoryx-unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
- Depend on @ncurses when building with Bazel [#2372](https://github.com/eclipse-iceoryx/iceoryx/issues/2372)
- Fix windows performance issue [#2377](https://github.com/eclipse-iceoryx/iceoryx/issues/2377)
- Max Client and Server cannot be configured independently of Max Publisher and Subscriber [#2394](https://github.com/eclipse-iceoryx/iceoryx/issues/2394)
- Use placement new to construct a new object during assignment [#2414](https://github.com/eclipse-iceoryx/iceoryx/issues/2414)

**Refactoring:**

Expand Down
2 changes: 1 addition & 1 deletion iceoryx_hoofs/test/moduletests/test_vocabulary_variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ TEST_F(variant_Test, DirectValueAssignmentWhenAlreadyAssignedWithDifferentType)
iox::variant<int, float> schlomo;
schlomo = 123;
schlomo = 123.01F;
EXPECT_THAT(schlomo.index(), Eq(0U));
EXPECT_THAT(schlomo.index(), Eq(1U));
}

TEST_F(variant_Test, HoldsAlternativeForCorrectType)
Expand Down
23 changes: 10 additions & 13 deletions iceoryx_hoofs/vocabulary/include/iox/detail/variant.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,25 +149,22 @@ template <typename T>
inline typename std::enable_if<!std::is_same<T, variant<Types...>&>::value, variant<Types...>>::type&
variant<Types...>::operator=(T&& rhs) noexcept
{
if (m_type_index == INVALID_VARIANT_INDEX)
if (m_type_index != internal::get_index_of_type<0, T, Types...>::index)
{
call_element_destructor();
new (&m_storage) T(std::move(rhs));
m_type_index = internal::get_index_of_type<0, T, Types...>::index;
}

if (!has_bad_variant_element_access<T>())
{
// AXIVION Next Construct AutosarC++19_03-M5.2.8: conversion to typed pointer is intentional, it is correctly aligned and points to sufficient memory for a T by design
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
auto storage = reinterpret_cast<T*>(&m_storage);
*storage = std::forward<T>(rhs);
}
else
{
error_message(__PRETTY_FUNCTION__,
"wrong variant type assignment, another type is already "
"set in variant");
if (m_type_index != INVALID_VARIANT_INDEX)
{
// AXIVION Next Construct AutosarC++19_03-M5.2.8: conversion to typed pointer is intentional, it is correctly aligned and points to sufficient memory for a T by design
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
auto storage = reinterpret_cast<T*>(&m_storage);
*storage = std::forward<T>(rhs);
}
}

return *this;
}

Expand Down