diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index f8cf90239a..b4626c63de 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -38,10 +38,10 @@ class json_pointer }; NLOHMANN_BASIC_JSON_TPL_DECLARATION - struct string_t_helper + // NOLINTNEXTLINE(readability/alt_tokens) + struct JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) string_t_helper { - using type JSON_HEDLEY_DEPRECATED_FOR(3.10.6, "basic_json::json_pointer or nlohmann::json_pointer") - = StringType; + using type = StringType; }; public: diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index e43fdac30e..fef8abfba1 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -2223,7 +2223,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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); @@ -2239,7 +2239,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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 { @@ -2522,7 +2522,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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); @@ -4217,7 +4217,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) reference operator[](const ::nlohmann::json_pointer& ptr) { return ptr.get_unchecked(this); @@ -4231,7 +4231,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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); @@ -4245,7 +4245,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) reference at(const ::nlohmann::json_pointer& ptr) { return ptr.get_checked(this); @@ -4259,7 +4259,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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 2abce37192..fcb1e78c45 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -12503,10 +12503,10 @@ class json_pointer }; NLOHMANN_BASIC_JSON_TPL_DECLARATION - struct string_t_helper + // NOLINTNEXTLINE(readability/alt_tokens) + struct JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) string_t_helper { - using type JSON_HEDLEY_DEPRECATED_FOR(3.10.6, "basic_json::json_pointer or nlohmann::json_pointer") - = StringType; + using type = StringType; }; public: @@ -19673,7 +19673,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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); @@ -19689,7 +19689,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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 { @@ -19972,7 +19972,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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); @@ -21667,7 +21667,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) reference operator[](const ::nlohmann::json_pointer& ptr) { return ptr.get_unchecked(this); @@ -21681,7 +21681,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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); @@ -21695,7 +21695,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, basic_json::json_pointer or nlohmann::json_pointer) // NOLINT(readability/alt_tokens) reference at(const ::nlohmann::json_pointer& ptr) { return ptr.get_checked(this); @@ -21709,7 +21709,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") + JSON_HEDLEY_DEPRECATED_FOR(3.10.6, 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);