diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2016-05-27 15:04:06 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-05-27 15:04:06 -0400 |
| commit | 40ff94ebef494e2e16107ce2965215ae67c031c1 (patch) | |
| tree | b6f6883c9751e6b8e369f078f09397129708d45f /objectivec/GPBDictionary.h | |
| parent | 86e8f1fd7add7b32f3218d121837b92e1c847e18 (diff) | |
| parent | 38b9e74691b484d2521fc6d8f421fc3dc14aa143 (diff) | |
| download | protobuf-40ff94ebef494e2e16107ce2965215ae67c031c1.tar.gz protobuf-40ff94ebef494e2e16107ce2965215ae67c031c1.tar.bz2 protobuf-40ff94ebef494e2e16107ce2965215ae67c031c1.zip | |
Merge pull request #1617 from thomasvl/more_warnings
Add -Woverriding-method-mismatch.
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() |