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

Allow to use get with explicit constructor #3079

Merged
merged 9 commits into from
Oct 14, 2021
Merged

Allow to use get with explicit constructor #3079

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a35702
:rewind: remove "fix" that caused #3077
nlohmann Oct 13, 2021
223bf3d
:mute: silence Clang-Tidy
nlohmann Oct 13, 2021
39928f5
:rotating_light: fix warnings
nlohmann Oct 13, 2021
346c00e
:rotating_light: fix warning
nlohmann Oct 13, 2021
d6740b4
:rotating_light: fix warning
nlohmann Oct 13, 2021
d698b6b
:mute: silence -Weffc++ warning
nlohmann Oct 13, 2021
28ba5e4
:recycle: default initialization
nlohmann Oct 14, 2021
b05fcf1
:recycle: default initialization
nlohmann Oct 14, 2021
179023b
Merge branch 'develop' of https://github.com/nlohmann/json into issue…
nlohmann Oct 14, 2021
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 include/nlohmann/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3069,7 +3069,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
{
ValueType ret{};
auto ret = ValueType();
JSONSerializer<ValueType>::from_json(*this, ret);
return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion single_include/nlohmann/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20556,7 +20556,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
{
ValueType ret{};
auto ret = ValueType();
JSONSerializer<ValueType>::from_json(*this, ret);
return ret;
}
Expand Down
34 changes: 34 additions & 0 deletions test/src/unit-regression2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,32 @@ template<class T>
class my_allocator : public std::allocator<T>
{};

/////////////////////////////////////////////////////////////////////
// for #3077
/////////////////////////////////////////////////////////////////////

class FooAlloc
{};

class Foo
{
public:
explicit Foo(const FooAlloc& /* unused */ = FooAlloc()) {}

bool value = false;
};

class FooBar
{
public:
Foo foo{};
};

inline void from_json(const nlohmann::json& j, FooBar& fb)
{
j.at("value").get_to(fb.foo.value);
}

TEST_CASE("regression tests 2")
{
SECTION("issue #1001 - Fix memory leak during parser callback")
Expand Down Expand Up @@ -695,6 +721,14 @@ TEST_CASE("regression tests 2")
json k = json::from_cbor(my_vector);
CHECK(j == k);
}

SECTION("issue #3077 - explicit constructor with default does not compile")
{
json j;
j[0]["value"] = true;
std::vector<FooBar> foo;
j.get_to(foo);
}
}

DOCTEST_CLANG_SUPPRESS_WARNING_POP