j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/nlohmann/json into develop

Browse source
This commit is contained in:
Niels Lohmann 2017-10-29 11:55:04 +01:00
commit 87df1d6708
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/json.hpp
View file

@ -6789,7 +6789,7 @@ class json_ref
{} {}
template <class... Args> template <class... Args>
json_ref(Args... args) json_ref(Args&&... args)
: owned_value(std::forward<Args>(args)...), : owned_value(std::forward<Args>(args)...),
value_ref(&owned_value), value_ref(&owned_value),
is_rvalue(true) is_rvalue(true)

24
test/src/unit-regression.cpp
View file

@ -36,6 +36,22 @@ using nlohmann::json;
#include <list> #include <list>
#include <cstdio> #include <cstdio>
namespace
{
struct nocopy
{
nocopy() = default;
nocopy(const nocopy &) = delete;
int val = 0;
friend void to_json(json& j, const nocopy& n)
{
j = {{"val", n.val}};
}
};
}
TEST_CASE("regression tests") TEST_CASE("regression tests")
{ {
SECTION("issue #60 - Double quotation mark is not parsed correctly") SECTION("issue #60 - Double quotation mark is not parsed correctly")
@ -1282,4 +1298,12 @@ TEST_CASE("regression tests")
} }
} }
*/ */
SECTION("issue #805 - copy constructor is used with std::initializer_list constructor.")
{
nocopy n;
json j;
j = {{"nocopy", n}};
CHECK(j["nocopy"]["val"] == 0);
}
} }