haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add noexcept tests

pull/423/head
Théo DELRIEU 2017-01-16 21:59:47 +01:00
parent af94e712c7
commit b56117b148
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/json.hpp
View File

@ -840,7 +840,7 @@ template <typename = void, typename = void>
struct adl_serializer
{
template <typename Json, typename T>
static void from_json(Json&& j, T& val)
static void from_json(Json&& j, T& val) noexcept(noexcept(::nlohmann::from_json(std::forward<Json>(j), val)))
{
::nlohmann::from_json(std::forward<Json>(j), val);
}

2
src/json.hpp.re2c
View File

@ -840,7 +840,7 @@ template <typename = void, typename = void>
struct adl_serializer
{
template <typename Json, typename T>
static void from_json(Json&& j, T& val)
static void from_json(Json&& j, T& val) noexcept(noexcept(::nlohmann::from_json(std::forward<Json>(j), val)))
{
::nlohmann::from_json(std::forward<Json>(j), val);
}

5
test/src/unit-noexcept.cpp
View File

@ -13,6 +13,8 @@ struct pod_bis {};
void to_json(json &, pod) noexcept;
void to_json(json &, pod_bis);
void from_json(const json&, pod) noexcept;
void from_json(const json&, pod_bis);
static json j;
static_assert(noexcept(json{}), "");
@ -25,3 +27,6 @@ static_assert(not noexcept(nlohmann::to_json(j, pod_bis{})), "");
static_assert(noexcept(json(2)), "");
static_assert(noexcept(json(test{})), "");
static_assert(noexcept(json(pod{})), "");
static_assert(noexcept(j.get<pod>()), "");
static_assert(not noexcept(j.get<pod_bis>()), "");
static_assert(noexcept(json(pod{})), "");