Skip to content

Commit 0be036c

Browse files
thomasvlcopybara-github
authored andcommitted
[ObjC] Add a C Preprocessor Check for removing some code in the future
PiperOrigin-RevId: 740886561
1 parent aefe47c commit 0be036c

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

objectivec/GPBDescriptor.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,13 @@ + (instancetype)allocDescriptorForClass:(Class)messageClass
153153
GPBFieldFlags unknownFieldFlags = (GPBFieldFlags)(~(
154154
GPBFieldRequired | GPBFieldRepeated | GPBFieldPacked | GPBFieldHasDefaultValue |
155155
GPBFieldClearHasIvarOnZero | GPBFieldTextFormatNameCustom | GPBFieldMapKeyMask));
156+
#if GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION > 40310
157+
#error "Time to remove these methods"
158+
#else
156159
if (runtimeSupport == &GOOGLE_PROTOBUF_OBJC_EXPECTED_GENCODE_VERSION_40310) {
157160
unknownFieldFlags &= ~GPBFieldOptional; // Allow 40310 to still have GPBFieldOptional.
158161
}
162+
#endif
159163
NSAssert((mergedFieldFlags & unknownFieldFlags) == 0, @"Internal error: unknown field flags set");
160164
#pragma clang diagnostic pop
161165
#endif // defined(DEBUG) && DEBUG

0 commit comments

Comments
 (0)