coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 14:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pull-request/#804-variant-varadic-default-constructed-state' into development

Browse Source
This commit is contained in:
John Wellbelove 2024-03-04 20:08:24 +00:00
commit 4245e23bee
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/etl/private/variant_variadic.h
View File

@ -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"

10
test/test_variant_variadic.cpp
View File

@ -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));
@ -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)
@ -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
{