Skip to content

Commit d666b3a

Browse files
committed
stop marking equal operators as deprecated nlohmann#4621
1 parent 0b6881a commit d666b3a

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

include/nlohmann/detail/json_pointer.hpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,8 @@ inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
936936

937937
template<typename RefStringTypeLhs,
938938
typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
939-
JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
939+
// generic function, should not be deprecated until the dependent ones are rewritten
940+
// JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
940941
inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
941942
const StringType& rhs)
942943
{
@@ -945,7 +946,8 @@ inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
945946

946947
template<typename RefStringTypeRhs,
947948
typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
948-
JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
949+
// generic function, should not be deprecated until the dependent ones are rewritten
950+
// JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
949951
inline bool operator==(const StringType& lhs,
950952
const json_pointer<RefStringTypeRhs>& rhs)
951953
{

single_include/nlohmann/json.hpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -15425,7 +15425,8 @@ inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
1542515425

1542615426
template<typename RefStringTypeLhs,
1542715427
typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
15428-
JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
15428+
// generic function, should not be deprecated until the dependent ones are rewritten
15429+
// JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
1542915430
inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
1543015431
const StringType& rhs)
1543115432
{
@@ -15434,7 +15435,8 @@ inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
1543415435

1543515436
template<typename RefStringTypeRhs,
1543615437
typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
15437-
JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
15438+
// generic function, should not be deprecated until the dependent ones are rewritten
15439+
// JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
1543815440
inline bool operator==(const StringType& lhs,
1543915441
const json_pointer<RefStringTypeRhs>& rhs)
1544015442
{

0 commit comments

Comments
 (0)