boost/json
2
0
Fork 0
mirror of https://github.com/boostorg/json.git synced 2026-02-13 00:22:21 +00:00
Code Issues Projects Releases Wiki Activity

value_to supports missing elements for std::optional

Browse Source
This commit is contained in:
Dmitry Arkhipov
2022-11-16 14:51:42 +03:00
parent a210032263
commit 8659e7d694
2 changed files with 75 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
test/value_to.cpp
View File

@@ -110,6 +110,20 @@ BOOST_DESCRIBE_STRUCT(T7, (T6), (s))
BOOST_DEFINE_ENUM_CLASS(E1, a, b, c)
//----------------------------------------------------------
struct T8
{
int n;
double d;
#ifndef BOOST_NO_CXX17_HDR_OPTIONAL
std::optional<std::string> opt_s;
#else
std::string opt_s;
#endif // BOOST_NO_CXX17_HDR_OPTIONAL
};
BOOST_DESCRIBE_STRUCT(T8, (), (n, d, opt_s))
} // namespace value_to_test_ns
namespace std
@@ -318,6 +332,10 @@ public:
BOOST_TEST( res );
BOOST_TEST( res->n == -78 );
BOOST_TEST( res->d == 0.125 );
jv.as_object()["x"] = 0;
BOOST_TEST_THROWS_WITH_LOCATION(
value_to<::value_to_test_ns::T6>( jv ));
}
{
value jv = {{"n", 1}, {"d", 2}, {"s", "xyz"}};
@@ -349,7 +367,22 @@ public:
value_to<::value_to_test_ns::E1>( value(1) ));
BOOST_TEST_THROWS_WITH_LOCATION(
value_to<::value_to_test_ns::E1>( value("x") ));
#endif
{
#ifndef BOOST_NO_CXX17_HDR_OPTIONAL
value jv = {{"n", -78}, {"d", 0.125}};
auto res = try_value_to<::value_to_test_ns::T8>(jv);
BOOST_TEST( res );
BOOST_TEST( res->n == -78 );
BOOST_TEST( res->d == 0.125 );
BOOST_TEST( std::nullopt == res->opt_s );
jv.as_object()["x"] = 0;
BOOST_TEST_THROWS_WITH_LOCATION(
value_to<::value_to_test_ns::T8>( jv ));
#endif // BOOST_NO_CXX17_HDR_OPTIONAL
}
#endif // BOOST_DESCRIBE_CXX14
}
#ifndef BOOST_NO_CXX17_HDR_OPTIONAL