mirror of
https://github.com/nlohmann/json.git
synced 2024-08-23 05:22:28 +02:00
Merge pull request #1769 from chris0x44/json_pointer
Make json_pointer::back const (resolves #1764)
This commit is contained in:
commit
dae0fe79af
|
@ -267,7 +267,7 @@ class json_pointer
|
||||||
|
|
||||||
@since version 3.6.0
|
@since version 3.6.0
|
||||||
*/
|
*/
|
||||||
const std::string& back()
|
const std::string& back() const
|
||||||
{
|
{
|
||||||
if (JSON_HEDLEY_UNLIKELY(empty()))
|
if (JSON_HEDLEY_UNLIKELY(empty()))
|
||||||
{
|
{
|
||||||
|
|
|
@ -10232,7 +10232,7 @@ class json_pointer
|
||||||
|
|
||||||
@since version 3.6.0
|
@since version 3.6.0
|
||||||
*/
|
*/
|
||||||
const std::string& back()
|
const std::string& back() const
|
||||||
{
|
{
|
||||||
if (JSON_HEDLEY_UNLIKELY(empty()))
|
if (JSON_HEDLEY_UNLIKELY(empty()))
|
||||||
{
|
{
|
||||||
|
|
|
@ -559,6 +559,10 @@ TEST_CASE("JSON pointers")
|
||||||
CHECK(!ptr.empty());
|
CHECK(!ptr.empty());
|
||||||
CHECK(j[ptr] == j["answer"]["everything"]);
|
CHECK(j[ptr] == j["answer"]["everything"]);
|
||||||
|
|
||||||
|
// check access via const pointer
|
||||||
|
const auto cptr = ptr;
|
||||||
|
CHECK(cptr.back() == "everything");
|
||||||
|
|
||||||
ptr.pop_back();
|
ptr.pop_back();
|
||||||
ptr.pop_back();
|
ptr.pop_back();
|
||||||
CHECK(ptr.empty());
|
CHECK(ptr.empty());
|
||||||
|
|
Loading…
Reference in a new issue