mirror of
https://github.com/nlohmann/json.git
synced 2026-10-28 00:35:43 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
84c5421644 |
No files matched your search
@@ -54,18 +54,14 @@ int accepts_any(nlohmann::basic_json_view<BasicJsonType, Mode> /*unused*/)
|
||||
return Mode == nlohmann::view_mode::editable ? 3 : 4;
|
||||
}
|
||||
|
||||
// overloads that differ only in the mode; deduction ignores the conversion from
|
||||
// read-only to editable views, so each view picks the overload of its own mode
|
||||
// (two templates that differ only in a decltype return type are a redefinition
|
||||
// for MSVC 2015)
|
||||
template<typename BasicJsonType>
|
||||
int overload(nlohmann::basic_json_view<BasicJsonType, nlohmann::view_mode::editable> v)
|
||||
template<typename View>
|
||||
auto overload(View v) -> decltype(accepts_editable(v))
|
||||
{
|
||||
return accepts_editable(v);
|
||||
}
|
||||
|
||||
template<typename BasicJsonType>
|
||||
int overload(nlohmann::basic_json_view<BasicJsonType, nlohmann::view_mode::read_only> v)
|
||||
template<typename View>
|
||||
auto overload(View v) -> decltype(accepts_read_only(v))
|
||||
{
|
||||
return accepts_read_only(v);
|
||||
}
|
||||
|
||||
@@ -1504,13 +1504,16 @@ TEST_CASE("regression tests 1")
|
||||
// a copied fifo_map restarts its timestamps, so a new key "k" gets
|
||||
// the timestamp of "x": the lookup does not find "k", but emplace()
|
||||
// finds "x" and inserts nothing; the pointer then continues with the
|
||||
// member of "x", as basic_json::operator[] does
|
||||
// member of "x", as basic_json::operator[] does. The object_t is
|
||||
// copied explicitly: copying the my_json would build the object
|
||||
// member by member (with fresh timestamps) when built with
|
||||
// JSON_NO_THREAD_LOCAL.
|
||||
const my_json orig = my_json::parse(R"({"x":1})");
|
||||
const std::array<const char*, 3> pointers = {{"/k/0", "/k/a/b", "/k/-"}};
|
||||
for (const char* pointer : pointers)
|
||||
{
|
||||
CAPTURE(pointer)
|
||||
my_json j = orig;
|
||||
my_json j(orig.get_ref<const my_json::object_t&>());
|
||||
CHECK_THROWS_AS(j[my_json::json_pointer(pointer)], my_json::out_of_range&);
|
||||
CHECK(j.dump() == R"({"x":1})");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user