Skip to content

Commit b115358

Browse files
anandoleecopybara-github
authored andcommitted
Breaking Change: Removes proto2::util::MessageDifferencer::AddIgnoreCriteria that takes a raw pointer as an argument in favor of the overload that takes a unique_ptr. Remove macro PROTOBUF_FUTURE_REMOVE_ADD_IGNORE_CRITERIA
https://protobuf.dev/news/2025-09-19/#cpp-remove-macros PiperOrigin-RevId: 842814251
1 parent e4854a1 commit b115358

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

src/google/protobuf/port_def.inc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,6 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
148148
// Owner: mkruskal@
149149
#define PROTOBUF_FUTURE_RENAME_ADD_UNUSED_IMPORT 1
150150

151-
// Removes google::protobuf::util::MessageDifferencer::AddIgnoreCriteria that takes a
152-
// raw pointer as an argument in favor of the overload that takes a unique_ptr.
153-
// Owner: mkruskal@, natebrennan@
154-
#define PROTOBUF_FUTURE_REMOVE_ADD_IGNORE_CRITERIA 1
155-
156151
// Marks several logically constant operations on Repeated*Field as nodiscard.
157152
// Owner: ckennelly@, mkruskal@
158153
#define PROTOBUF_FUTURE_ADD_NODISCARD [[nodiscard]]

src/google/protobuf/util/message_differencer.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -504,13 +504,6 @@ class PROTOBUF_EXPORT MessageDifferencer {
504504

505505
// Add a custom ignore criteria that is evaluated in addition to the
506506
// ignored fields added with IgnoreField.
507-
#ifndef PROTOBUF_FUTURE_REMOVE_ADD_IGNORE_CRITERIA
508-
ABSL_DEPRECATE_AND_INLINE()
509-
void AddIgnoreCriteria(IgnoreCriteria* ignore_criteria) {
510-
AddIgnoreCriteria(absl::WrapUnique(ignore_criteria));
511-
}
512-
#endif // !PROTOBUF_FUTURE_REMOVE_ADD_IGNORE_CRITERIA
513-
514507
void AddIgnoreCriteria(std::unique_ptr<IgnoreCriteria> ignore_criteria);
515508

516509
// Indicates that any field with the given descriptor should be

0 commit comments

Comments
 (0)