Skip to content

Commit 748ab16

Browse files
mkruskal-googlecopybara-github
authored andcommitted
Breaking change: remove const GetArena method on RepeatedPtrField
PiperOrigin-RevId: 597349773
1 parent 1610bf1 commit 748ab16

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

src/google/protobuf/port_def.inc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,6 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
163163
// Owner: shaod@, gberg@
164164
#define PROTOBUF_FUTURE_DESCRIPTOR_EXTENSION_DECL 1
165165

166-
// Used to remove `RepeatedPtrField::GetArena() const`.
167-
// Owner: ezb@
168-
#define PROTOBUF_FUTURE_REMOVE_CONST_REPEATEDFIELD_GETARENA_API 1
169-
170166
#endif
171167

172168
// Defines the Protobuf C++ Version for checking version compatibility at

src/google/protobuf/repeated_ptr_field.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,11 +1175,6 @@ class RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
11751175
// Gets the arena on which this RepeatedPtrField stores its elements.
11761176
inline Arena* GetArena();
11771177

1178-
#ifndef PROTOBUF_FUTURE_REMOVE_CONST_REPEATEDFIELD_GETARENA_API
1179-
ABSL_DEPRECATED("This will be removed in a future release")
1180-
inline Arena* GetArena() const;
1181-
#endif // !PROTOBUF_FUTURE_REMOVE_CONST_REPEATEDFIELD_GETARENA_API
1182-
11831178
// For internal use only.
11841179
//
11851180
// This is public due to it being called by generated code.
@@ -1512,13 +1507,6 @@ inline Arena* RepeatedPtrField<Element>::GetArena() {
15121507
return RepeatedPtrFieldBase::GetArena();
15131508
}
15141509

1515-
#ifndef PROTOBUF_FUTURE_REMOVE_CONST_REPEATEDFIELD_GETARENA_API
1516-
template <typename Element>
1517-
inline Arena* RepeatedPtrField<Element>::GetArena() const {
1518-
return RepeatedPtrFieldBase::GetArena();
1519-
}
1520-
#endif // !PROTOBUF_FUTURE_REMOVE_CONST_REPEATEDFIELD_GETARENA_API
1521-
15221510
template <typename Element>
15231511
inline size_t RepeatedPtrField<Element>::SpaceUsedExcludingSelfLong() const {
15241512
// `google::protobuf::Message` has a virtual method `SpaceUsedLong`, hence we can

0 commit comments

Comments
 (0)