diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2016-05-27 12:51:18 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-05-27 12:52:35 -0400 |
| commit | 38b9e74691b484d2521fc6d8f421fc3dc14aa143 (patch) | |
| tree | 86d27bd76f0ce069e207194676619fbf700f69bf /objectivec/GPBDictionary.h | |
| parent | 0f27cab4fb378b94a91c2b1522174ec21719df9d (diff) | |
| download | protobuf-38b9e74691b484d2521fc6d8f421fc3dc14aa143.tar.gz protobuf-38b9e74691b484d2521fc6d8f421fc3dc14aa143.tar.bz2 protobuf-38b9e74691b484d2521fc6d8f421fc3dc14aa143.zip | |
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.
Diffstat (limited to 'objectivec/GPBDictionary.h')
| -rw-r--r-- | objectivec/GPBDictionary.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/objectivec/GPBDictionary.h b/objectivec/GPBDictionary.h index 3120814a..b98aaa1f 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() |