Breaking change: Promote ExtensionRange to a proper class

mkruskal-google · copybara-github · commit 5b12bc858f1f · 2023-12-11T13:54:06.000-08:00
PiperOrigin-RevId: 589938315
diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h
@@ -497,10 +497,7 @@ class PROTOBUF_EXPORT Descriptor : private internal::SymbolBase {
     // 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_;
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -167,10 +167,6 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 // 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
