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

Jump to bottom

variant varadic default constructed state #804

Merged
merged 3 commits into from
Feb 22, 2024
Merged

variant varadic default constructed state #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69033e6
fixed variant varadic default constructed state
fermentedfly Dec 13, 2023
9fc7a34
updated testcases to account for default contructor changes
fermentedfly Dec 18, 2023
bbfd201
Merge branch 'master' into fix_variant_default_contructed_state
fermentedfly Jan 31, 2024
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
2 changes: 1 addition & 1 deletion include/etl/private/variant_variadic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ namespace etl

default_construct_in_place<type>(data);
operation = operation_type<type, etl::is_copy_constructible<type>::value, etl::is_move_constructible<type>::value>::do_operation;
type_id = 0U;
type_id = variant_npos;
}
#include "diagnostic_pop.h"

Expand Down
10 changes: 5 additions & 5 deletions test/test_variant_variadic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,15 +420,15 @@ namespace

test_variant_etl_3 variant_etl;

CHECK(etl::holds_alternative<char>(variant_etl));
CHECK(!etl::holds_alternative<char>(variant_etl));
CHECK(!etl::holds_alternative<int>(variant_etl));
CHECK(!etl::holds_alternative<std::string>(variant_etl));

CHECK(etl::holds_alternative<0U>(variant_etl));
CHECK(!etl::holds_alternative<0U>(variant_etl));
CHECK(!etl::holds_alternative<1U>(variant_etl));
CHECK(!etl::holds_alternative<2U>(variant_etl));

CHECK(etl::holds_alternative(0U, variant_etl));
CHECK(!etl::holds_alternative(0U, variant_etl));
CHECK(!etl::holds_alternative(1U, variant_etl));
CHECK(!etl::holds_alternative(2U, variant_etl));
CHECK(!etl::holds_alternative(99U, variant_etl));
Expand Down Expand Up @@ -1830,7 +1830,7 @@ namespace
//*************************************************************************
TEST(test_variant_visit_void)
{
etl::variant<int8_t, uint8_t> variant1;
etl::variant<int8_t, uint8_t> variant1 = int8_t{};

bool variant_was_signed{};
auto const f = [&variant_was_signed](auto v)
Expand All @@ -1857,7 +1857,7 @@ namespace

std::string result = "?";

etl::variant<TypeA, TypeB, TypeC, TypeD> package;
etl::variant<TypeA, TypeB, TypeC, TypeD> package = TypeA{};

etl::visit(etl::overload
{
Expand Down
Loading