From 38b9e74691b484d2521fc6d8f421fc3dc14aa143 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Fri, 27 May 2016 12:51:18 -0400 Subject: Add -Woverriding-method-mismatch. Fixes up the code to avoid some issues with isEqual: methods. Opened https://github.com/google/protobuf/issues/1616 to track the KVC collision. --- objectivec/GPBDictionary.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'objectivec/GPBDictionary.h') diff --git a/objectivec/GPBDictionary.h b/objectivec/GPBDictionary.h index 3120814a6..b98aaa1fe 100644 --- a/objectivec/GPBDictionary.h +++ b/objectivec/GPBDictionary.h @@ -39,6 +39,12 @@ NS_ASSUME_NONNULL_BEGIN +// Disable -Woverriding-method-mismatch until resolving the accidental conflict +// with NSObject's KVC category. +// https://github.com/google/protobuf/issues/1616 opened to resolve this. +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Woverriding-method-mismatch" + //%PDDM-EXPAND DECLARE_DICTIONARIES() // This block of code is generated, do not edit it directly. @@ -2085,6 +2091,8 @@ NS_ASSUME_NONNULL_BEGIN //%PDDM-EXPAND-END DECLARE_DICTIONARIES() +#pragma clang diagnostic pop + NS_ASSUME_NONNULL_END //%PDDM-DEFINE DECLARE_DICTIONARIES() -- cgit v1.2.3