Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add forwarding references to json_ref constructor #807

Merged
merged 1 commit into from
Oct 28, 2017
Merged

add forwarding references to json_ref constructor #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6789,7 +6789,7 @@ class json_ref
{}

template <class... Args>
json_ref(Args... args)
json_ref(Args&&... args)
: owned_value(std::forward<Args>(args)...),
value_ref(&owned_value),
is_rvalue(true)
Expand Down
24 changes: 24 additions & 0 deletions test/src/unit-regression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ using nlohmann::json;
#include <list>
#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")
{
SECTION("issue #60 - Double quotation mark is not parsed correctly")
Expand Down Expand Up @@ -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);
}
}