commit 5b12bc858f1f0e02477ac3e3e3fea5bc88f1bdc3
author Mike Kruskal <mkruskal@google.com> Mon Dec 11 13:51:54 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Dec 11 13:54:06 2023 -0800
tree 413c10581b03eaff5568c917412cfa29f27f45cc
parent 229906f3091742e05e51445a66164025b0244409

Breaking change: Promote ExtensionRange to a proper class

PiperOrigin-RevId: 589938315

src/google/protobuf/descriptor.h

diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h
index e4ec0eb..dfb71df 100644
--- a/src/google/protobuf/descriptor.h
+++ b/src/google/protobuf/descriptor.h
@@ -497,10 +497,7 @@
     // Never nullptr.
     const Descriptor* containing_type() const { return containing_type_; }
 
-#ifdef PROTOBUF_FUTURE_EXTENSION_RANGE_CLASS
-
    private:
-#endif
     int start_;
     int end_;
     const ExtensionRangeOptions* options_;

src/google/protobuf/port_def.inc

diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index c0307c0..edf0fcc 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -167,10 +167,6 @@
 // Owner: ezb@
 #define PROTOBUF_FUTURE_REMOVE_CONST_REPEATEDFIELD_GETARENA_API 1
 
-// Used to make ExtensionRange into a fully-fledged descriptor class.
-// Owner: mkruskal@
-#define PROTOBUF_FUTURE_EXTENSION_RANGE_CLASS 1
-
 // Used to lock down wrong ctype usages in proto file.
 // Owner: jieluo@
 #define PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE 1