coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-29 13:58:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/ETLCPP/etl into development

Browse Source 
# Conflicts:
#	include/etl/private/variant_variadic.h
#	test/test_variant_variadic.cpp
This commit is contained in:
John Wellbelove 2023-05-16 10:21:04 +01:00
commit 8469c303bc
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/test_variant_variadic.cpp
View File

@ -857,7 +857,7 @@ namespace
}
//*************************************************************************
TEST(test_variant_accept_visitor_depracated)
TEST(test_variant_accept_visitor_deprecated)
{
struct Visitor : public etl::visitor<char, int, std::string>
{
@ -901,7 +901,8 @@ namespace
CHECK_EQUAL(2, visitor.result_i);
variant_etl = std::string("3");
variant_etl.accept_visitor(visitor);
//variant_etl.accept_visitor(visitor);
variant_etl.accept(visitor);
CHECK_EQUAL("3", visitor.result_s);
}
@ -1000,12 +1001,14 @@ namespace
variant_etl = int(2);
const test_variant_etl_3 const_variant_etl2(variant_etl);
const_variant_etl2.accept_visitor(visitor);
//const_variant_etl2.accept_visitor(visitor);
const_variant_etl2.accept(visitor);
CHECK_EQUAL(2, visitor.result_i);
variant_etl = std::string("3");
const test_variant_etl_3 const_variant_etl3(variant_etl);
const_variant_etl3.accept_visitor(visitor);
//const_variant_etl3.accept_visitor(visitor);
const_variant_etl3.accept(visitor);
CHECK_EQUAL("3", visitor.result_s);
}
@ -1103,7 +1106,8 @@ namespace
CHECK_EQUAL(2, visitor.result_i);
variant_etl = std::string("3");
variant_etl.accept_functor(visitor);
//variant_etl.accept_functor(visitor);
variant_etl.accept(visitor);
CHECK_EQUAL("3", visitor.result_s);
}
@ -1202,12 +1206,14 @@ namespace
variant_etl = int(2);
const test_variant_etl_3 const_variant_etl2(variant_etl);
const_variant_etl2.accept_functor(visitor);
//const_variant_etl2.accept_functor(visitor);
const_variant_etl2.accept(visitor);
CHECK_EQUAL(2, visitor.result_i);
variant_etl = std::string("3");
const test_variant_etl_3 const_variant_etl3(variant_etl);
const_variant_etl3.accept_functor(visitor);
//const_variant_etl3.accept_functor(visitor);
const_variant_etl3.accept(visitor);
CHECK_EQUAL("3", visitor.result_s);
}
@ -1256,11 +1262,13 @@ namespace
CHECK_EQUAL(1, result_c);
variant_etl = int(2);
variant_etl.accept_functor(visitor);
//variant_etl.accept_functor(visitor);
variant_etl.accept(visitor);
CHECK_EQUAL(2, result_i);
variant_etl = std::string("3");
variant_etl.accept_functor(visitor);
//variant_etl.accept_functor(visitor);
variant_etl.accept(visitor);
CHECK_EQUAL("3", result_s);
}
@ -1313,12 +1321,14 @@ namespace
variant_etl = int(2);
const test_variant_etl_3 const_variant_etl2(variant_etl);
const_variant_etl2.accept_functor(visitor);
//const_variant_etl2.accept_functor(visitor);
const_variant_etl2.accept(visitor);
CHECK_EQUAL(2, result_i);
variant_etl = std::string("3");
const test_variant_etl_3 const_variant_etl3(variant_etl);
const_variant_etl3.accept_functor(visitor);
//const_variant_etl3.accept_functor(visitor);
const_variant_etl3.accept(visitor);
CHECK_EQUAL("3", result_s);
}
#endif