From fdb15f956fb1d206ae4fb4683136d16702eb4f18 Mon Sep 17 00:00:00 2001 From: Florian Albrechtskirchinger Date: Fri, 8 Apr 2022 11:51:25 +0200 Subject: [PATCH] Update version numbers --- doc/mkdocs/docs/api/json_pointer/back.md | 2 +- doc/mkdocs/docs/api/json_pointer/index.md | 2 +- doc/mkdocs/docs/api/json_pointer/json_pointer.md | 2 +- doc/mkdocs/docs/api/json_pointer/operator_slash.md | 2 +- .../docs/api/json_pointer/operator_slasheq.md | 2 +- .../docs/api/json_pointer/operator_string.md | 2 +- doc/mkdocs/docs/api/json_pointer/push_back.md | 2 +- doc/mkdocs/docs/api/json_pointer/string_t.md | 2 +- doc/mkdocs/docs/api/json_pointer/to_string.md | 2 +- include/nlohmann/json.hpp | 14 +++++++------- single_include/nlohmann/json.hpp | 14 +++++++------- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/mkdocs/docs/api/json_pointer/back.md b/doc/mkdocs/docs/api/json_pointer/back.md index a29748744..240bc6e1e 100644 --- a/doc/mkdocs/docs/api/json_pointer/back.md +++ b/doc/mkdocs/docs/api/json_pointer/back.md @@ -37,4 +37,4 @@ Constant. ## Version history - Added in version 3.6.0. -- Changed return type to `string_t` in version 3.10.6. +- Changed return type to `string_t` in version 3.11.0. diff --git a/doc/mkdocs/docs/api/json_pointer/index.md b/doc/mkdocs/docs/api/json_pointer/index.md index 507474c49..3504c9ff7 100644 --- a/doc/mkdocs/docs/api/json_pointer/index.md +++ b/doc/mkdocs/docs/api/json_pointer/index.md @@ -43,4 +43,4 @@ For backwards compatibility `RefStringType` may also be a specialization of [`ba ## Version history - Added in version 2.0.0. -- Changed template parameter from `basic_json` to string type in version 3.10.6. +- Changed template parameter from `basic_json` to string type in version 3.11.0. diff --git a/doc/mkdocs/docs/api/json_pointer/json_pointer.md b/doc/mkdocs/docs/api/json_pointer/json_pointer.md index b59c2ec0c..5e7057fc9 100644 --- a/doc/mkdocs/docs/api/json_pointer/json_pointer.md +++ b/doc/mkdocs/docs/api/json_pointer/json_pointer.md @@ -38,4 +38,4 @@ Create a JSON pointer according to the syntax described in ## Version history - Added in version 2.0.0. -- Changed type of `s` to `string_t` in version 3.10.6. +- Changed type of `s` to `string_t` in version 3.11.0. diff --git a/doc/mkdocs/docs/api/json_pointer/operator_slash.md b/doc/mkdocs/docs/api/json_pointer/operator_slash.md index 56d313ebf..ed77b504b 100644 --- a/doc/mkdocs/docs/api/json_pointer/operator_slash.md +++ b/doc/mkdocs/docs/api/json_pointer/operator_slash.md @@ -60,5 +60,5 @@ json_pointer operator/(const json_pointer& lhs, std::size_t array_idx); ## Version history 1. Added in version 3.6.0. -2. Added in version 3.6.0. Changed type of `token` to `string_t` in version 3.10.6. +2. Added in version 3.6.0. Changed type of `token` to `string_t` in version 3.11.0. 3. Added in version 3.6.0. diff --git a/doc/mkdocs/docs/api/json_pointer/operator_slasheq.md b/doc/mkdocs/docs/api/json_pointer/operator_slasheq.md index 1887e3da6..3518557d5 100644 --- a/doc/mkdocs/docs/api/json_pointer/operator_slasheq.md +++ b/doc/mkdocs/docs/api/json_pointer/operator_slasheq.md @@ -57,5 +57,5 @@ json_pointer& operator/=(std::size_t array_idx) ## Version history 1. Added in version 3.6.0. -2. Added in version 3.6.0. Changed type of `token` to `string_t` in version 3.10.6. +2. Added in version 3.6.0. Changed type of `token` to `string_t` in version 3.11.0. 3. Added in version 3.6.0. diff --git a/doc/mkdocs/docs/api/json_pointer/operator_string.md b/doc/mkdocs/docs/api/json_pointer/operator_string.md index fedc1e71b..836728c18 100644 --- a/doc/mkdocs/docs/api/json_pointer/operator_string.md +++ b/doc/mkdocs/docs/api/json_pointer/operator_string.md @@ -22,4 +22,4 @@ operator string_t() const ## Version history - Since version 2.0.0. -- Changed type to `string_t`. +- Changed type to `string_t` in version 3.11.0. diff --git a/doc/mkdocs/docs/api/json_pointer/push_back.md b/doc/mkdocs/docs/api/json_pointer/push_back.md index 9c726b46d..c1c19cb8d 100644 --- a/doc/mkdocs/docs/api/json_pointer/push_back.md +++ b/doc/mkdocs/docs/api/json_pointer/push_back.md @@ -36,4 +36,4 @@ Amortized constant. ## Version history - Added in version 3.6.0. -- Changed type of `token` to `string_t` in version 3.10.6. +- Changed type of `token` to `string_t` in version 3.11.0. diff --git a/doc/mkdocs/docs/api/json_pointer/string_t.md b/doc/mkdocs/docs/api/json_pointer/string_t.md index 3a72b5852..f18b51b81 100644 --- a/doc/mkdocs/docs/api/json_pointer/string_t.md +++ b/doc/mkdocs/docs/api/json_pointer/string_t.md @@ -9,4 +9,4 @@ See [`basic_json::string_t`](../basic_json/string_t.md) for more information. ## Version history -- Added in version 3.10.6. +- Added in version 3.11.0. diff --git a/doc/mkdocs/docs/api/json_pointer/to_string.md b/doc/mkdocs/docs/api/json_pointer/to_string.md index 16319b85d..fae3abe5f 100644 --- a/doc/mkdocs/docs/api/json_pointer/to_string.md +++ b/doc/mkdocs/docs/api/json_pointer/to_string.md @@ -37,4 +37,4 @@ ptr == json_pointer(ptr.to_string()); ## Version history - Since version 2.0.0. -- Changed return type to `string_t` in version 3.10.6. +- Changed return type to `string_t` in version 3.11.0. diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index a5f299170..5776b62e7 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -2227,7 +2227,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec template::value, int>::type = 0> - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) ValueType value(const ::nlohmann::json_pointer& ptr, const ValueType& default_value) const { return value(ptr.convert(), default_value); @@ -2243,7 +2243,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) JSON_HEDLEY_NON_NULL(3) string_t value(const typename ::nlohmann::json_pointer& ptr, const char* default_value) const { @@ -2526,7 +2526,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) bool contains(const typename ::nlohmann::json_pointer ptr) const { return ptr.contains(this); @@ -4221,7 +4221,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) reference operator[](const ::nlohmann::json_pointer& ptr) { return ptr.get_unchecked(this); @@ -4235,7 +4235,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) const_reference operator[](const ::nlohmann::json_pointer& ptr) const { return ptr.get_unchecked(this); @@ -4249,7 +4249,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) reference at(const ::nlohmann::json_pointer& ptr) { return ptr.get_checked(this); @@ -4263,7 +4263,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) const_reference at(const ::nlohmann::json_pointer& ptr) const { return ptr.get_checked(this); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 5df8554a6..60aeac544 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -19676,7 +19676,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec template::value, int>::type = 0> - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) ValueType value(const ::nlohmann::json_pointer& ptr, const ValueType& default_value) const { return value(ptr.convert(), default_value); @@ -19692,7 +19692,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) JSON_HEDLEY_NON_NULL(3) string_t value(const typename ::nlohmann::json_pointer& ptr, const char* default_value) const { @@ -19975,7 +19975,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) bool contains(const typename ::nlohmann::json_pointer ptr) const { return ptr.contains(this); @@ -21670,7 +21670,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) reference operator[](const ::nlohmann::json_pointer& ptr) { return ptr.get_unchecked(this); @@ -21684,7 +21684,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) const_reference operator[](const ::nlohmann::json_pointer& ptr) const { return ptr.get_unchecked(this); @@ -21698,7 +21698,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) reference at(const ::nlohmann::json_pointer& ptr) { return ptr.get_checked(this); @@ -21712,7 +21712,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } template - JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) + JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) const_reference at(const ::nlohmann::json_pointer& ptr) const { return ptr.get_checked(this);