aboutsummaryrefslogtreecommitdiff
path: root/objectivec/GPBDictionary.m
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2016-05-26 11:10:00 -0400
committerThomas Van Lenten <thomasvl@google.com>2016-05-26 11:10:00 -0400
commit0f27cab4fb378b94a91c2b1522174ec21719df9d (patch)
tree6111cbd70b21027c678647381eba6d3974b51740 /objectivec/GPBDictionary.m
parented87c1fe2c6e1633cadb62cf54b2723b2b25c280 (diff)
parentc8a440dfb68074ff310e624928cd2dd61c101728 (diff)
downloadprotobuf-0f27cab4fb378b94a91c2b1522174ec21719df9d.tar.gz
protobuf-0f27cab4fb378b94a91c2b1522174ec21719df9d.tar.bz2
protobuf-0f27cab4fb378b94a91c2b1522174ec21719df9d.zip
Merge pull request #1600 from thomasvl/objc_tighter_warnings
Add more warnings to for the ObjC runtime build
Diffstat (limited to 'objectivec/GPBDictionary.m')
-rw-r--r--objectivec/GPBDictionary.m11
1 files changed, 11 insertions, 0 deletions
diff --git a/objectivec/GPBDictionary.m b/objectivec/GPBDictionary.m
index 3bd146e0..0f0241a1 100644
--- a/objectivec/GPBDictionary.m
+++ b/objectivec/GPBDictionary.m
@@ -45,6 +45,12 @@
// directly.
// ------------------------------------------------------------------
+// Direct access is use for speed, to avoid even internally declaring things
+// read/write, etc. The warning is enabled in the project to ensure code calling
+// protos can turn on -Wdirect-ivar-access without issues.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+
// Used to include code only visible to specific versions of the static
// analyzer. Useful for wrapping code that only exists to silence the analyzer.
// Determine the values you want to use for BEGIN_APPLE_BUILD_VERSION,
@@ -484,6 +490,8 @@ void GPBDictionaryReadEntry(id mapDictionary,
key.valueString = [@"" retain];
}
if (GPBDataTypeIsObject(valueDataType) && value.valueString == nil) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wswitch-enum"
switch (valueDataType) {
case GPBDataTypeString:
value.valueString = [@"" retain];
@@ -505,6 +513,7 @@ void GPBDictionaryReadEntry(id mapDictionary,
// Nothing
break;
}
+#pragma clang diagnostic pop
}
if ((keyDataType == GPBDataTypeString) && GPBDataTypeIsObject(valueDataType)) {
@@ -13553,3 +13562,5 @@ void GPBDictionaryReadEntry(id mapDictionary,
}
@end
+
+#pragma clang diagnostic pop