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

Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path

Browse source
This commit is contained in:
garethsb-sony 2019-02-25 08:57:12 +00:00 committed by gbsylveg
parent 5da757bbb3
commit 164e0e54d9
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/nlohmann/detail/json_pointer.hpp
View file

@ -149,7 +149,7 @@ class json_pointer
*/ */
std::string pop_back() std::string pop_back()
{ {
if (JSON_UNLIKELY(is_root())) if (JSON_UNLIKELY(empty()))
{ {
JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent")); JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
} }
@ -173,16 +173,16 @@ class json_pointer
reference_tokens.push_back(std::move(token)); reference_tokens.push_back(std::move(token));
} }
private:
/// return whether pointer points to the root document /// return whether pointer points to the root document
bool is_root() const noexcept bool empty() const noexcept
{ {
return reference_tokens.empty(); return reference_tokens.empty();
} }
private:
json_pointer top() const json_pointer top() const
{ {
if (JSON_UNLIKELY(is_root())) if (JSON_UNLIKELY(empty()))
{ {
JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent")); JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
} }

2
include/nlohmann/json.hpp
View file

@ -7466,7 +7466,7 @@ class basic_json
const auto operation_add = [&result](json_pointer & ptr, basic_json val) const auto operation_add = [&result](json_pointer & ptr, basic_json val)
{ {
// adding to the root of the target document means replacing it // adding to the root of the target document means replacing it
if (ptr.is_root()) if (ptr.empty())
{ {
result = val; result = val;
} }

10
single_include/nlohmann/json.hpp
View file

@ -11959,7 +11959,7 @@ class json_pointer
*/ */
std::string pop_back() std::string pop_back()
{ {
if (JSON_UNLIKELY(is_root())) if (JSON_UNLIKELY(empty()))
{ {
JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent")); JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
} }
@ -11983,16 +11983,16 @@ class json_pointer
reference_tokens.push_back(std::move(token)); reference_tokens.push_back(std::move(token));
} }
private:
/// return whether pointer points to the root document /// return whether pointer points to the root document
bool is_root() const noexcept bool empty() const noexcept
{ {
return reference_tokens.empty(); return reference_tokens.empty();
} }
private:
json_pointer top() const json_pointer top() const
{ {
if (JSON_UNLIKELY(is_root())) if (JSON_UNLIKELY(empty()))
{ {
JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent")); JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
} }
@ -20016,7 +20016,7 @@ class basic_json
const auto operation_add = [&result](json_pointer & ptr, basic_json val) const auto operation_add = [&result](json_pointer & ptr, basic_json val)
{ {
// adding to the root of the target document means replacing it // adding to the root of the target document means replacing it
if (ptr.is_root()) if (ptr.empty())
{ {
result = val; result = val;
} }