[ObjC] Move from `#pragma unused()` to `_unused`
diff --git a/objectivec/GPBCodedOutputStream.m b/objectivec/GPBCodedOutputStream.m
index 6dd537a..c21e7d2 100644
--- a/objectivec/GPBCodedOutputStream.m
+++ b/objectivec/GPBCodedOutputStream.m
@@ -416,19 +416,16 @@
//% if (tag != 0) {
//% if (values.count == 0) return;
//% __block size_t dataSize = 0;
-//% [values enumerate##ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%#pragma unused(idx, stop)
+//% [values enumerate##ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, __unused NSUInteger idx,__unused BOOL *stop) {
//% dataSize += GPBCompute##NAME##SizeNoTag(value);
//% }];
//% GPBWriteRawVarint32(&state_, tag);
//% GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-//% [values enumerate##ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%#pragma unused(idx, stop)
+//% [values enumerate##ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, __unused NSUInteger idx, __unused BOOL *stop) {
//% [self write##NAME##NoTag:value];
//% }];
//% } else {
-//% [values enumerate##ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%#pragma unused(idx, stop)
+//% [values enumerate##ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, __unused NSUInteger idx, __unused BOOL *stop) {
//% [self write##NAME:fieldNumber value:value];
//% }];
//% }
@@ -450,19 +447,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(double value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeDoubleSizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(double value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeDoubleNoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(double value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeDouble:fieldNumber value:value];
}];
}
@@ -477,19 +471,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(float value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeFloatSizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(float value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeFloatNoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(float value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeFloat:fieldNumber value:value];
}];
}
@@ -504,19 +495,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeUInt64SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeUInt64NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeUInt64:fieldNumber value:value];
}];
}
@@ -531,19 +519,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int64_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeInt64SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeInt64NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeInt64:fieldNumber value:value];
}];
}
@@ -558,19 +543,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int32_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeInt32SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeInt32NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeInt32:fieldNumber value:value];
}];
}
@@ -585,19 +567,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeUInt32SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeUInt32NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeUInt32:fieldNumber value:value];
}];
}
@@ -612,19 +591,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeFixed64SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeFixed64NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeFixed64:fieldNumber value:value];
}];
}
@@ -639,19 +615,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeFixed32SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeFixed32NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeFixed32:fieldNumber value:value];
}];
}
@@ -666,19 +639,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int32_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeSInt32SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeSInt32NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeSInt32:fieldNumber value:value];
}];
}
@@ -693,19 +663,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int64_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeSInt64SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeSInt64NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeSInt64:fieldNumber value:value];
}];
}
@@ -720,19 +687,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int64_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeSFixed64SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeSFixed64NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeSFixed64:fieldNumber value:value];
}];
}
@@ -747,19 +711,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int32_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeSFixed32SizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeSFixed32NoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeSFixed32:fieldNumber value:value];
}];
}
@@ -774,19 +735,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(BOOL value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeBoolSizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(BOOL value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeBoolNoTag:value];
}];
} else {
- [values enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateValuesWithBlock:^(BOOL value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeBool:fieldNumber value:value];
}];
}
@@ -801,19 +759,16 @@
if (tag != 0) {
if (values.count == 0) return;
__block size_t dataSize = 0;
- [values enumerateRawValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateRawValuesWithBlock:^(int32_t value, __unused NSUInteger idx,__unused BOOL *stop) {
dataSize += GPBComputeEnumSizeNoTag(value);
}];
GPBWriteRawVarint32(&state_, tag);
GPBWriteRawVarint32(&state_, (int32_t)dataSize);
- [values enumerateRawValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateRawValuesWithBlock:^(int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeEnumNoTag:value];
}];
} else {
- [values enumerateRawValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
+ [values enumerateRawValuesWithBlock:^(int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
[self writeEnum:fieldNumber value:value];
}];
}
@@ -964,15 +919,9 @@
@end
-size_t GPBComputeDoubleSizeNoTag(Float64 value) {
-#pragma unused(value)
- return LITTLE_ENDIAN_64_SIZE;
-}
+size_t GPBComputeDoubleSizeNoTag(__unused Float64 value) { return LITTLE_ENDIAN_64_SIZE; }
-size_t GPBComputeFloatSizeNoTag(Float32 value) {
-#pragma unused(value)
- return LITTLE_ENDIAN_32_SIZE;
-}
+size_t GPBComputeFloatSizeNoTag(__unused Float32 value) { return LITTLE_ENDIAN_32_SIZE; }
size_t GPBComputeUInt64SizeNoTag(uint64_t value) { return GPBComputeRawVarint64Size(value); }
@@ -991,20 +940,11 @@
return GPBComputeInt32SizeNoTag((int32_t)value);
}
-size_t GPBComputeFixed64SizeNoTag(uint64_t value) {
-#pragma unused(value)
- return LITTLE_ENDIAN_64_SIZE;
-}
+size_t GPBComputeFixed64SizeNoTag(__unused uint64_t value) { return LITTLE_ENDIAN_64_SIZE; }
-size_t GPBComputeFixed32SizeNoTag(uint32_t value) {
-#pragma unused(value)
- return LITTLE_ENDIAN_32_SIZE;
-}
+size_t GPBComputeFixed32SizeNoTag(__unused uint32_t value) { return LITTLE_ENDIAN_32_SIZE; }
-size_t GPBComputeBoolSizeNoTag(BOOL value) {
-#pragma unused(value)
- return 1;
-}
+size_t GPBComputeBoolSizeNoTag(__unused BOOL value) { return 1; }
size_t GPBComputeStringSizeNoTag(NSString *value) {
NSUInteger length = [value lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
@@ -1029,15 +969,9 @@
size_t GPBComputeEnumSizeNoTag(int32_t value) { return GPBComputeInt32SizeNoTag(value); }
-size_t GPBComputeSFixed32SizeNoTag(int32_t value) {
-#pragma unused(value)
- return LITTLE_ENDIAN_32_SIZE;
-}
+size_t GPBComputeSFixed32SizeNoTag(__unused int32_t value) { return LITTLE_ENDIAN_32_SIZE; }
-size_t GPBComputeSFixed64SizeNoTag(int64_t value) {
-#pragma unused(value)
- return LITTLE_ENDIAN_64_SIZE;
-}
+size_t GPBComputeSFixed64SizeNoTag(__unused int64_t value) { return LITTLE_ENDIAN_64_SIZE; }
size_t GPBComputeSInt32SizeNoTag(int32_t value) {
return GPBComputeRawVarint32Size(GPBEncodeZigZag32(value));
diff --git a/objectivec/GPBDescriptor.m b/objectivec/GPBDescriptor.m
index f6feaff..72368ce 100644
--- a/objectivec/GPBDescriptor.m
+++ b/objectivec/GPBDescriptor.m
@@ -296,8 +296,7 @@
return result;
}
-- (id)copyWithZone:(NSZone *)zone {
-#pragma unused(zone)
+- (id)copyWithZone:(__unused NSZone *)zone {
return [self retain];
}
@@ -997,8 +996,7 @@
[super dealloc];
}
-- (instancetype)copyWithZone:(NSZone *)zone {
-#pragma unused(zone)
+- (instancetype)copyWithZone:(__unused NSZone *)zone {
// Immutable.
return [self retain];
}
diff --git a/objectivec/GPBDictionary.m b/objectivec/GPBDictionary.m
index 53ee568..1d71307 100644
--- a/objectivec/GPBDictionary.m
+++ b/objectivec/GPBDictionary.m
@@ -113,15 +113,13 @@
//%}
//%
//%PDDM-DEFINE SIMPLE_SERIALIZE_SUPPORT(VALUE_NAME, VALUE_TYPE, VisP)
-//%static size_t ComputeDict##VALUE_NAME##FieldSize(VALUE_TYPE VisP##value, uint32_t fieldNum, GPBDataType dataType) {
+//%static size_t ComputeDict##VALUE_NAME##FieldSize(VALUE_TYPE VisP##value, uint32_t fieldNum, __unused GPBDataType dataType) {
//% NSCAssert(dataType == GPBDataType##VALUE_NAME, @"bad type: %d", dataType);
-//% #pragma unused(dataType) // For when asserts are off in release.
//% return GPBCompute##VALUE_NAME##Size(fieldNum, value);
//%}
//%
-//%static void WriteDict##VALUE_NAME##Field(GPBCodedOutputStream *stream, VALUE_TYPE VisP##value, uint32_t fieldNum, GPBDataType dataType) {
+//%static void WriteDict##VALUE_NAME##Field(GPBCodedOutputStream *stream, VALUE_TYPE VisP##value, uint32_t fieldNum, __unused GPBDataType dataType) {
//% NSCAssert(dataType == GPBDataType##VALUE_NAME, @"bad type: %d", dataType);
-//% #pragma unused(dataType) // For when asserts are off in release.
//% [stream write##VALUE_NAME##:fieldNum value:value];
//%}
//%
@@ -231,63 +229,53 @@
}
}
-static size_t ComputeDictBoolFieldSize(BOOL value, uint32_t fieldNum, GPBDataType dataType) {
+static size_t ComputeDictBoolFieldSize(BOOL value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeBool, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
return GPBComputeBoolSize(fieldNum, value);
}
-static void WriteDictBoolField(GPBCodedOutputStream *stream, BOOL value, uint32_t fieldNum, GPBDataType dataType) {
+static void WriteDictBoolField(GPBCodedOutputStream *stream, BOOL value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeBool, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
[stream writeBool:fieldNum value:value];
}
-static size_t ComputeDictEnumFieldSize(int32_t value, uint32_t fieldNum, GPBDataType dataType) {
+static size_t ComputeDictEnumFieldSize(int32_t value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeEnum, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
return GPBComputeEnumSize(fieldNum, value);
}
-static void WriteDictEnumField(GPBCodedOutputStream *stream, int32_t value, uint32_t fieldNum, GPBDataType dataType) {
+static void WriteDictEnumField(GPBCodedOutputStream *stream, int32_t value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeEnum, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
[stream writeEnum:fieldNum value:value];
}
-static size_t ComputeDictFloatFieldSize(float value, uint32_t fieldNum, GPBDataType dataType) {
+static size_t ComputeDictFloatFieldSize(float value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeFloat, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
return GPBComputeFloatSize(fieldNum, value);
}
-static void WriteDictFloatField(GPBCodedOutputStream *stream, float value, uint32_t fieldNum, GPBDataType dataType) {
+static void WriteDictFloatField(GPBCodedOutputStream *stream, float value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeFloat, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
[stream writeFloat:fieldNum value:value];
}
-static size_t ComputeDictDoubleFieldSize(double value, uint32_t fieldNum, GPBDataType dataType) {
+static size_t ComputeDictDoubleFieldSize(double value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeDouble, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
return GPBComputeDoubleSize(fieldNum, value);
}
-static void WriteDictDoubleField(GPBCodedOutputStream *stream, double value, uint32_t fieldNum, GPBDataType dataType) {
+static void WriteDictDoubleField(GPBCodedOutputStream *stream, double value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeDouble, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
[stream writeDouble:fieldNum value:value];
}
-static size_t ComputeDictStringFieldSize(NSString *value, uint32_t fieldNum, GPBDataType dataType) {
+static size_t ComputeDictStringFieldSize(NSString *value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeString, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
return GPBComputeStringSize(fieldNum, value);
}
-static void WriteDictStringField(GPBCodedOutputStream *stream, NSString *value, uint32_t fieldNum, GPBDataType dataType) {
+static void WriteDictStringField(GPBCodedOutputStream *stream, NSString *value, uint32_t fieldNum, __unused GPBDataType dataType) {
NSCAssert(dataType == GPBDataTypeString, @"bad type: %d", dataType);
- #pragma unused(dataType) // For when asserts are off in release.
[stream writeString:fieldNum value:value];
}
@@ -358,10 +346,10 @@
}
}
-BOOL GPBDictionaryIsInitializedInternalHelper(NSDictionary *dict, GPBFieldDescriptor *field) {
+BOOL GPBDictionaryIsInitializedInternalHelper(NSDictionary *dict,
+ __unused GPBFieldDescriptor *field) {
NSCAssert(field.mapKeyDataType == GPBDataTypeString, @"Unexpected key type");
NSCAssert(GPBGetFieldDataType(field) == GPBDataTypeMessage, @"Unexpected value type");
-#pragma unused(field) // For when asserts are off in release.
GPBMessage *msg;
NSEnumerator *objects = [dict objectEnumerator];
while ((msg = [objects nextObject])) {
@@ -600,8 +588,7 @@
//% return self;
//%}
//%
-//%- (instancetype)initWithCapacity:(NSUInteger)numItems {
-//% #pragma unused(numItems)
+//%- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
//% return [self initWith##VNAME##s:NULL forKeys:NULL count:0];
//%}
//%
@@ -666,8 +653,7 @@
//%}
//%
//%- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-//% capacity:(NSUInteger)numItems {
-//% #pragma unused(numItems)
+//% capacity:(__unused NSUInteger)numItems {
//% return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
//%}
//%
@@ -833,8 +819,7 @@
//%}
//%
//%- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-//% [self enumerateKeysAnd##ACCESSOR_NAME##VNAME##sUsingBlock:^(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, BOOL *stop) {
-//% #pragma unused(stop)
+//% [self enumerateKeysAnd##ACCESSOR_NAME##VNAME##sUsingBlock:^(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, __unused BOOL *stop) {
//% block(TEXT_FORMAT_OBJ##KEY_NAME(key), TEXT_FORMAT_OBJ##VALUE_NAME(VNAME_VAR));
//% }];
//%}
@@ -888,8 +873,7 @@
//%
//%BOOL_DICT_INITS_##HELPER(VALUE_NAME, VALUE_TYPE)
//%
-//%- (instancetype)initWithCapacity:(NSUInteger)numItems {
-//% #pragma unused(numItems)
+//%- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
//% return [self initWith##VNAME##s:NULL forKeys:NULL count:0];
//%}
//%
@@ -1439,8 +1423,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt32s:NULL forKeys:NULL count:0];
}
@@ -1546,8 +1529,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt32sUsingBlock:^(uint32_t key, uint32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt32sUsingBlock:^(uint32_t key, uint32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%u", value]);
}];
}
@@ -1622,8 +1604,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt32s:NULL forKeys:NULL count:0];
}
@@ -1729,8 +1710,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt32sUsingBlock:^(uint32_t key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt32sUsingBlock:^(uint32_t key, int32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%d", value]);
}];
}
@@ -1805,8 +1785,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt64s:NULL forKeys:NULL count:0];
}
@@ -1912,8 +1891,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt64sUsingBlock:^(uint32_t key, uint64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt64sUsingBlock:^(uint32_t key, uint64_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%llu", value]);
}];
}
@@ -1988,8 +1966,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt64s:NULL forKeys:NULL count:0];
}
@@ -2095,8 +2072,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt64sUsingBlock:^(uint32_t key, int64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt64sUsingBlock:^(uint32_t key, int64_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%lld", value]);
}];
}
@@ -2171,8 +2147,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithBools:NULL forKeys:NULL count:0];
}
@@ -2278,8 +2253,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndBoolsUsingBlock:^(uint32_t key, BOOL value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndBoolsUsingBlock:^(uint32_t key, BOOL value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%u", key], (value ? @"true" : @"false"));
}];
}
@@ -2354,8 +2328,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithFloats:NULL forKeys:NULL count:0];
}
@@ -2461,8 +2434,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndFloatsUsingBlock:^(uint32_t key, float value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndFloatsUsingBlock:^(uint32_t key, float value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
}];
}
@@ -2537,8 +2509,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithDoubles:NULL forKeys:NULL count:0];
}
@@ -2644,8 +2615,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndDoublesUsingBlock:^(uint32_t key, double value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndDoublesUsingBlock:^(uint32_t key, double value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
}];
}
@@ -2733,8 +2703,7 @@
}
- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
- capacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+ capacity:(__unused NSUInteger)numItems {
return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
}
@@ -2852,8 +2821,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndRawValuesUsingBlock:^(uint32_t key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndRawValuesUsingBlock:^(uint32_t key, int32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%u", key], @(value));
}];
}
@@ -2976,8 +2944,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithObjects:NULL forKeys:NULL count:0];
}
@@ -3107,8 +3074,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndObjectsUsingBlock:^(uint32_t key, id object, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndObjectsUsingBlock:^(uint32_t key, id object, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%u", key], object);
}];
}
@@ -3187,8 +3153,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt32s:NULL forKeys:NULL count:0];
}
@@ -3294,8 +3259,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt32sUsingBlock:^(int32_t key, uint32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt32sUsingBlock:^(int32_t key, uint32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%u", value]);
}];
}
@@ -3370,8 +3334,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt32s:NULL forKeys:NULL count:0];
}
@@ -3477,8 +3440,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt32sUsingBlock:^(int32_t key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt32sUsingBlock:^(int32_t key, int32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%d", value]);
}];
}
@@ -3553,8 +3515,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt64s:NULL forKeys:NULL count:0];
}
@@ -3660,8 +3621,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt64sUsingBlock:^(int32_t key, uint64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt64sUsingBlock:^(int32_t key, uint64_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%llu", value]);
}];
}
@@ -3736,8 +3696,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt64s:NULL forKeys:NULL count:0];
}
@@ -3843,8 +3802,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt64sUsingBlock:^(int32_t key, int64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt64sUsingBlock:^(int32_t key, int64_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%lld", value]);
}];
}
@@ -3919,8 +3877,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithBools:NULL forKeys:NULL count:0];
}
@@ -4026,8 +3983,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndBoolsUsingBlock:^(int32_t key, BOOL value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndBoolsUsingBlock:^(int32_t key, BOOL value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%d", key], (value ? @"true" : @"false"));
}];
}
@@ -4102,8 +4058,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithFloats:NULL forKeys:NULL count:0];
}
@@ -4209,8 +4164,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndFloatsUsingBlock:^(int32_t key, float value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndFloatsUsingBlock:^(int32_t key, float value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
}];
}
@@ -4285,8 +4239,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithDoubles:NULL forKeys:NULL count:0];
}
@@ -4392,8 +4345,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndDoublesUsingBlock:^(int32_t key, double value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndDoublesUsingBlock:^(int32_t key, double value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
}];
}
@@ -4481,8 +4433,7 @@
}
- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
- capacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+ capacity:(__unused NSUInteger)numItems {
return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
}
@@ -4600,8 +4551,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndRawValuesUsingBlock:^(int32_t key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndRawValuesUsingBlock:^(int32_t key, int32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%d", key], @(value));
}];
}
@@ -4724,8 +4674,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithObjects:NULL forKeys:NULL count:0];
}
@@ -4855,8 +4804,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndObjectsUsingBlock:^(int32_t key, id object, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndObjectsUsingBlock:^(int32_t key, id object, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%d", key], object);
}];
}
@@ -4935,8 +4883,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt32s:NULL forKeys:NULL count:0];
}
@@ -5042,8 +4989,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt32sUsingBlock:^(uint64_t key, uint32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt32sUsingBlock:^(uint64_t key, uint32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%u", value]);
}];
}
@@ -5118,8 +5064,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt32s:NULL forKeys:NULL count:0];
}
@@ -5225,8 +5170,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt32sUsingBlock:^(uint64_t key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt32sUsingBlock:^(uint64_t key, int32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%d", value]);
}];
}
@@ -5301,8 +5245,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt64s:NULL forKeys:NULL count:0];
}
@@ -5408,8 +5351,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt64sUsingBlock:^(uint64_t key, uint64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt64sUsingBlock:^(uint64_t key, uint64_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%llu", value]);
}];
}
@@ -5484,8 +5426,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt64s:NULL forKeys:NULL count:0];
}
@@ -5591,8 +5532,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt64sUsingBlock:^(uint64_t key, int64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt64sUsingBlock:^(uint64_t key, int64_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%lld", value]);
}];
}
@@ -5667,8 +5607,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithBools:NULL forKeys:NULL count:0];
}
@@ -5774,8 +5713,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndBoolsUsingBlock:^(uint64_t key, BOOL value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndBoolsUsingBlock:^(uint64_t key, BOOL value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%llu", key], (value ? @"true" : @"false"));
}];
}
@@ -5850,8 +5788,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithFloats:NULL forKeys:NULL count:0];
}
@@ -5957,8 +5894,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndFloatsUsingBlock:^(uint64_t key, float value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndFloatsUsingBlock:^(uint64_t key, float value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
}];
}
@@ -6033,8 +5969,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithDoubles:NULL forKeys:NULL count:0];
}
@@ -6140,8 +6075,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndDoublesUsingBlock:^(uint64_t key, double value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndDoublesUsingBlock:^(uint64_t key, double value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
}];
}
@@ -6229,8 +6163,7 @@
}
- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
- capacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+ capacity:(__unused NSUInteger)numItems {
return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
}
@@ -6348,8 +6281,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndRawValuesUsingBlock:^(uint64_t key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndRawValuesUsingBlock:^(uint64_t key, int32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%llu", key], @(value));
}];
}
@@ -6472,8 +6404,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithObjects:NULL forKeys:NULL count:0];
}
@@ -6603,8 +6534,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndObjectsUsingBlock:^(uint64_t key, id object, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndObjectsUsingBlock:^(uint64_t key, id object, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%llu", key], object);
}];
}
@@ -6683,8 +6613,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt32s:NULL forKeys:NULL count:0];
}
@@ -6790,8 +6719,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt32sUsingBlock:^(int64_t key, uint32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt32sUsingBlock:^(int64_t key, uint32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%u", value]);
}];
}
@@ -6866,8 +6794,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt32s:NULL forKeys:NULL count:0];
}
@@ -6973,8 +6900,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt32sUsingBlock:^(int64_t key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt32sUsingBlock:^(int64_t key, int32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%d", value]);
}];
}
@@ -7049,8 +6975,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt64s:NULL forKeys:NULL count:0];
}
@@ -7156,8 +7081,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt64sUsingBlock:^(int64_t key, uint64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt64sUsingBlock:^(int64_t key, uint64_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%llu", value]);
}];
}
@@ -7232,8 +7156,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt64s:NULL forKeys:NULL count:0];
}
@@ -7339,8 +7262,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt64sUsingBlock:^(int64_t key, int64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt64sUsingBlock:^(int64_t key, int64_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%lld", value]);
}];
}
@@ -7415,8 +7337,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithBools:NULL forKeys:NULL count:0];
}
@@ -7522,8 +7443,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndBoolsUsingBlock:^(int64_t key, BOOL value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndBoolsUsingBlock:^(int64_t key, BOOL value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%lld", key], (value ? @"true" : @"false"));
}];
}
@@ -7598,8 +7518,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithFloats:NULL forKeys:NULL count:0];
}
@@ -7705,8 +7624,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndFloatsUsingBlock:^(int64_t key, float value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndFloatsUsingBlock:^(int64_t key, float value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
}];
}
@@ -7781,8 +7699,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithDoubles:NULL forKeys:NULL count:0];
}
@@ -7888,8 +7805,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndDoublesUsingBlock:^(int64_t key, double value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndDoublesUsingBlock:^(int64_t key, double value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
}];
}
@@ -7977,8 +7893,7 @@
}
- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
- capacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+ capacity:(__unused NSUInteger)numItems {
return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
}
@@ -8096,8 +8011,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndRawValuesUsingBlock:^(int64_t key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndRawValuesUsingBlock:^(int64_t key, int32_t value, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%lld", key], @(value));
}];
}
@@ -8220,8 +8134,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithObjects:NULL forKeys:NULL count:0];
}
@@ -8351,8 +8264,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndObjectsUsingBlock:^(int64_t key, id object, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndObjectsUsingBlock:^(int64_t key, id object, __unused BOOL *stop) {
block([NSString stringWithFormat:@"%lld", key], object);
}];
}
@@ -8435,8 +8347,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt32s:NULL forKeys:NULL count:0];
}
@@ -8542,8 +8453,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt32sUsingBlock:^(NSString *key, uint32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt32sUsingBlock:^(NSString *key, uint32_t value, __unused BOOL *stop) {
block(key, [NSString stringWithFormat:@"%u", value]);
}];
}
@@ -8626,8 +8536,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt32s:NULL forKeys:NULL count:0];
}
@@ -8733,8 +8642,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt32sUsingBlock:^(NSString *key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt32sUsingBlock:^(NSString *key, int32_t value, __unused BOOL *stop) {
block(key, [NSString stringWithFormat:@"%d", value]);
}];
}
@@ -8817,8 +8725,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt64s:NULL forKeys:NULL count:0];
}
@@ -8924,8 +8831,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndUInt64sUsingBlock:^(NSString *key, uint64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndUInt64sUsingBlock:^(NSString *key, uint64_t value, __unused BOOL *stop) {
block(key, [NSString stringWithFormat:@"%llu", value]);
}];
}
@@ -9008,8 +8914,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt64s:NULL forKeys:NULL count:0];
}
@@ -9115,8 +9020,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndInt64sUsingBlock:^(NSString *key, int64_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndInt64sUsingBlock:^(NSString *key, int64_t value, __unused BOOL *stop) {
block(key, [NSString stringWithFormat:@"%lld", value]);
}];
}
@@ -9199,8 +9103,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithBools:NULL forKeys:NULL count:0];
}
@@ -9306,8 +9209,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndBoolsUsingBlock:^(NSString *key, BOOL value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndBoolsUsingBlock:^(NSString *key, BOOL value, __unused BOOL *stop) {
block(key, (value ? @"true" : @"false"));
}];
}
@@ -9390,8 +9292,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithFloats:NULL forKeys:NULL count:0];
}
@@ -9497,8 +9398,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndFloatsUsingBlock:^(NSString *key, float value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndFloatsUsingBlock:^(NSString *key, float value, __unused BOOL *stop) {
block(key, [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
}];
}
@@ -9581,8 +9481,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithDoubles:NULL forKeys:NULL count:0];
}
@@ -9688,8 +9587,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndDoublesUsingBlock:^(NSString *key, double value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndDoublesUsingBlock:^(NSString *key, double value, __unused BOOL *stop) {
block(key, [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
}];
}
@@ -9785,8 +9683,7 @@
}
- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
- capacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+ capacity:(__unused NSUInteger)numItems {
return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
}
@@ -9904,8 +9801,7 @@
}
- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
- [self enumerateKeysAndRawValuesUsingBlock:^(NSString *key, int32_t value, BOOL *stop) {
- #pragma unused(stop)
+ [self enumerateKeysAndRawValuesUsingBlock:^(NSString *key, int32_t value, __unused BOOL *stop) {
block(key, @(value));
}];
}
@@ -10043,8 +9939,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt32s:NULL forKeys:NULL count:0];
}
@@ -10252,8 +10147,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt32s:NULL forKeys:NULL count:0];
}
@@ -10461,8 +10355,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithUInt64s:NULL forKeys:NULL count:0];
}
@@ -10670,8 +10563,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithInt64s:NULL forKeys:NULL count:0];
}
@@ -10879,8 +10771,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithBools:NULL forKeys:NULL count:0];
}
@@ -11088,8 +10979,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithFloats:NULL forKeys:NULL count:0];
}
@@ -11297,8 +11187,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithDoubles:NULL forKeys:NULL count:0];
}
@@ -11505,8 +11394,7 @@
return self;
}
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
- #pragma unused(numItems)
+- (instancetype)initWithCapacity:(__unused NSUInteger)numItems {
return [self initWithObjects:NULL forKeys:NULL count:0];
}
@@ -11750,8 +11638,7 @@
}
- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
- capacity:(NSUInteger)numItems {
-#pragma unused(numItems)
+ capacity:(__unused NSUInteger)numItems {
return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
}
diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m
index 5a2c059..528149f 100644
--- a/objectivec/GPBMessage.m
+++ b/objectivec/GPBMessage.m
@@ -953,13 +953,12 @@
NSMutableDictionary *newDict =
[[NSMutableDictionary alloc] initWithCapacity:existingDict.count];
newValue = newDict;
- [existingDict
- enumerateKeysAndObjectsUsingBlock:^(NSString *key, GPBMessage *msg, BOOL *stop) {
-#pragma unused(stop)
- GPBMessage *copiedMsg = [msg copyWithZone:zone];
- [newDict setObject:copiedMsg forKey:key];
- [copiedMsg release];
- }];
+ [existingDict enumerateKeysAndObjectsUsingBlock:^(NSString *key, GPBMessage *msg,
+ __unused BOOL *stop) {
+ GPBMessage *copiedMsg = [msg copyWithZone:zone];
+ [newDict setObject:copiedMsg forKey:key];
+ [copiedMsg release];
+ }];
} else {
// Is one of the GPB*ObjectDictionary classes. Type doesn't
// matter, just need one to invoke the selector.
@@ -2909,8 +2908,7 @@
#define CASE_REPEATED_POD_EXTRA(NAME, TYPE, ARRAY_TYPE, ARRAY_ACCESSOR_NAME) \
case GPBDataType##NAME: { \
GPB##ARRAY_TYPE##Array *array = genericArray; \
- [array enumerate##ARRAY_ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) { \
- _Pragma("unused(idx, stop)"); \
+ [array enumerate##ARRAY_ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, __unused NSUInteger idx, __unused BOOL *stop) { \
dataSize += GPBCompute##NAME##SizeNoTag(value); \
}]; \
break; \
diff --git a/objectivec/GPBRootObject.m b/objectivec/GPBRootObject.m
index 3126440..08adfcf 100644
--- a/objectivec/GPBRootObject.m
+++ b/objectivec/GPBRootObject.m
@@ -73,15 +73,12 @@
// to worry about deallocation. All of the items are added to it at
// startup, and so the keys don't need to be retained/released.
// Keys are NULL terminated char *.
-static const void *GPBRootExtensionKeyRetain(CFAllocatorRef allocator, const void *value) {
-#pragma unused(allocator)
+static const void *GPBRootExtensionKeyRetain(__unused CFAllocatorRef allocator, const void *value) {
return value;
}
-static void GPBRootExtensionKeyRelease(CFAllocatorRef allocator, const void *value) {
-#pragma unused(allocator)
-#pragma unused(value)
-}
+static void GPBRootExtensionKeyRelease(__unused CFAllocatorRef allocator,
+ __unused const void *value) {}
static CFStringRef GPBRootExtensionCopyKeyDescription(const void *value) {
const char *key = (const char *)value;
@@ -207,8 +204,7 @@
if (extension != nil) {
const char *encoding = GPBMessageEncodingForSelector(@selector(getClassValue), NO);
Class metaClass = objc_getMetaClass(class_getName(self));
- IMP imp = imp_implementationWithBlock(^(id obj) {
-#pragma unused(obj)
+ IMP imp = imp_implementationWithBlock(^(__unused id obj) {
return extension;
});
BOOL methodAdded = class_addMethod(metaClass, sel, imp, encoding);
diff --git a/objectivec/GPBUnknownField.m b/objectivec/GPBUnknownField.m
index 262d082..62cfb22 100644
--- a/objectivec/GPBUnknownField.m
+++ b/objectivec/GPBUnknownField.m
@@ -153,20 +153,20 @@
- (size_t)serializedSize {
__block size_t result = 0;
int32_t number = number_;
- [mutableVarintList_ enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
- result += GPBComputeUInt64Size(number, value);
- }];
+ [mutableVarintList_
+ enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
+ result += GPBComputeUInt64Size(number, value);
+ }];
- [mutableFixed32List_ enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
- result += GPBComputeFixed32Size(number, value);
- }];
+ [mutableFixed32List_
+ enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
+ result += GPBComputeFixed32Size(number, value);
+ }];
- [mutableFixed64List_ enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
- result += GPBComputeFixed64Size(number, value);
- }];
+ [mutableFixed64List_
+ enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
+ result += GPBComputeFixed64Size(number, value);
+ }];
for (NSData *data in mutableLengthDelimitedList_) {
result += GPBComputeBytesSize(number, data);
@@ -196,20 +196,20 @@
- (NSString *)description {
NSMutableString *description =
[NSMutableString stringWithFormat:@"<%@ %p>: Field: %d {\n", [self class], self, number_];
- [mutableVarintList_ enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
- [description appendFormat:@"\t%llu\n", value];
- }];
+ [mutableVarintList_
+ enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
+ [description appendFormat:@"\t%llu\n", value];
+ }];
- [mutableFixed32List_ enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
- [description appendFormat:@"\t%u\n", value];
- }];
+ [mutableFixed32List_
+ enumerateValuesWithBlock:^(uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
+ [description appendFormat:@"\t%u\n", value];
+ }];
- [mutableFixed64List_ enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
- [description appendFormat:@"\t%llu\n", value];
- }];
+ [mutableFixed64List_
+ enumerateValuesWithBlock:^(uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
+ [description appendFormat:@"\t%llu\n", value];
+ }];
for (NSData *data in mutableLengthDelimitedList_) {
[description appendFormat:@"\t%@\n", data];
diff --git a/objectivec/GPBUnknownFieldSet.m b/objectivec/GPBUnknownFieldSet.m
index 101e102..dcd4b44 100644
--- a/objectivec/GPBUnknownFieldSet.m
+++ b/objectivec/GPBUnknownFieldSet.m
@@ -49,8 +49,7 @@
CFMutableDictionaryRef fields_;
}
-static void CopyWorker(const void *key, const void *value, void *context) {
-#pragma unused(key)
+static void CopyWorker(__unused const void *key, const void *value, void *context) {
GPBUnknownField *field = value;
GPBUnknownFieldSet *result = context;
@@ -184,8 +183,8 @@
return description;
}
-static void GPBUnknownFieldSetSerializedSize(const void *key, const void *value, void *context) {
-#pragma unused(key)
+static void GPBUnknownFieldSetSerializedSize(__unused const void *key, const void *value,
+ void *context) {
GPBUnknownField *field = value;
size_t *result = context;
*result += [field serializedSize];
@@ -199,9 +198,8 @@
return result;
}
-static void GPBUnknownFieldSetWriteAsMessageSetTo(const void *key, const void *value,
+static void GPBUnknownFieldSetWriteAsMessageSetTo(__unused const void *key, const void *value,
void *context) {
-#pragma unused(key)
GPBUnknownField *field = value;
GPBCodedOutputStream *output = context;
[field writeAsMessageSetExtensionToOutput:output];
@@ -213,9 +211,8 @@
}
}
-static void GPBUnknownFieldSetSerializedSizeAsMessageSet(const void *key, const void *value,
- void *context) {
-#pragma unused(key)
+static void GPBUnknownFieldSetSerializedSizeAsMessageSet(__unused const void *key,
+ const void *value, void *context) {
GPBUnknownField *field = value;
size_t *result = context;
*result += [field serializedSizeAsMessageSetExtension];
@@ -266,9 +263,8 @@
return existing;
}
-static void GPBUnknownFieldSetMergeUnknownFields(const void *key, const void *value,
+static void GPBUnknownFieldSetMergeUnknownFields(__unused const void *key, const void *value,
void *context) {
-#pragma unused(key)
GPBUnknownField *field = value;
GPBUnknownFieldSet *self = context;
diff --git a/objectivec/GPBUtilities.m b/objectivec/GPBUtilities.m
index d355ee4..5c8ee04 100644
--- a/objectivec/GPBUtilities.m
+++ b/objectivec/GPBUtilities.m
@@ -115,18 +115,16 @@
switch (field.mapKeyDataType) {
case GPBDataTypeBool:
[(GPBBoolObjectDictionary *)rawFieldMap
- enumerateKeysAndObjectsUsingBlock:^(BOOL key, id _Nonnull object,
- BOOL *_Nonnull stop) {
-#pragma unused(key, stop)
+ enumerateKeysAndObjectsUsingBlock:^(__unused BOOL key, id _Nonnull object,
+ __unused BOOL *_Nonnull stop) {
[todo addObject:object];
}];
break;
case GPBDataTypeFixed32:
case GPBDataTypeUInt32:
[(GPBUInt32ObjectDictionary *)rawFieldMap
- enumerateKeysAndObjectsUsingBlock:^(uint32_t key, id _Nonnull object,
- BOOL *_Nonnull stop) {
-#pragma unused(key, stop)
+ enumerateKeysAndObjectsUsingBlock:^(__unused uint32_t key, id _Nonnull object,
+ __unused BOOL *_Nonnull stop) {
[todo addObject:object];
}];
break;
@@ -134,18 +132,16 @@
case GPBDataTypeSFixed32:
case GPBDataTypeSInt32:
[(GPBInt32ObjectDictionary *)rawFieldMap
- enumerateKeysAndObjectsUsingBlock:^(int32_t key, id _Nonnull object,
- BOOL *_Nonnull stop) {
-#pragma unused(key, stop)
+ enumerateKeysAndObjectsUsingBlock:^(__unused int32_t key, id _Nonnull object,
+ __unused BOOL *_Nonnull stop) {
[todo addObject:object];
}];
break;
case GPBDataTypeFixed64:
case GPBDataTypeUInt64:
[(GPBUInt64ObjectDictionary *)rawFieldMap
- enumerateKeysAndObjectsUsingBlock:^(uint64_t key, id _Nonnull object,
- BOOL *_Nonnull stop) {
-#pragma unused(key, stop)
+ enumerateKeysAndObjectsUsingBlock:^(__unused uint64_t key, id _Nonnull object,
+ __unused BOOL *_Nonnull stop) {
[todo addObject:object];
}];
break;
@@ -153,17 +149,16 @@
case GPBDataTypeSFixed64:
case GPBDataTypeSInt64:
[(GPBInt64ObjectDictionary *)rawFieldMap
- enumerateKeysAndObjectsUsingBlock:^(int64_t key, id _Nonnull object,
- BOOL *_Nonnull stop) {
-#pragma unused(key, stop)
+ enumerateKeysAndObjectsUsingBlock:^(__unused int64_t key, id _Nonnull object,
+ __unused BOOL *_Nonnull stop) {
[todo addObject:object];
}];
break;
case GPBDataTypeString:
[(NSDictionary *)rawFieldMap
- enumerateKeysAndObjectsUsingBlock:^(
- NSString *_Nonnull key, GPBMessage *_Nonnull obj, BOOL *_Nonnull stop) {
-#pragma unused(key, stop)
+ enumerateKeysAndObjectsUsingBlock:^(__unused NSString *_Nonnull key,
+ GPBMessage *_Nonnull obj,
+ __unused BOOL *_Nonnull stop) {
[todo addObject:obj];
}];
break;
@@ -1604,8 +1599,7 @@
if ((keyDataType == GPBDataTypeString) && GPBDataTypeIsObject(valueDataType)) {
// map is an NSDictionary.
NSDictionary *dict = map;
- [dict enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
-#pragma unused(stop)
+ [dict enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, __unused BOOL *stop) {
[toStr appendString:(isFirst ? msgStartFirst : msgStart)];
isFirst = NO;
@@ -1997,11 +1991,11 @@
for (GPBUnknownField *field in [unknownSet sortedFields]) {
int32_t fieldNumber = [field number];
-#define PRINT_LOOP(PROPNAME, CTYPE, FORMAT) \
- [field.PROPNAME enumerateValuesWithBlock:^(CTYPE value, NSUInteger idx, BOOL * stop) { \
- _Pragma("unused(idx, stop)"); \
- [result appendFormat:@"%@%d: " FORMAT "\n", lineIndent, fieldNumber, value]; \
- }];
+#define PRINT_LOOP(PROPNAME, CTYPE, FORMAT) \
+ [field.PROPNAME \
+ enumerateValuesWithBlock:^(CTYPE value, __unused NSUInteger idx, __unused BOOL * stop) { \
+ [result appendFormat:@"%@%d: " FORMAT "\n", lineIndent, fieldNumber, value]; \
+ }];
PRINT_LOOP(varintList, uint64_t, "%llu");
PRINT_LOOP(fixed32List, uint32_t, "0x%X");
@@ -2180,14 +2174,12 @@
// Shim from the older generated code into the runtime.
void GPBSetInt32IvarWithFieldInternal(GPBMessage *self, GPBFieldDescriptor *field, int32_t value,
- GPBFileSyntax syntax) {
-#pragma unused(syntax)
+ __unused GPBFileSyntax syntax) {
GPBSetMessageInt32Field(self, field, value);
}
void GPBMaybeClearOneof(GPBMessage *self, GPBOneofDescriptor *oneof, int32_t oneofHasIndex,
- uint32_t fieldNumberNotToClear) {
-#pragma unused(fieldNumberNotToClear)
+ __unused uint32_t fieldNumberNotToClear) {
#if defined(DEBUG) && DEBUG
NSCAssert([[self descriptor] oneofWithName:oneof.name] == oneof,
@"OneofDescriptor %@ doesn't appear to be for %@ messages.", oneof.name, [self class]);
diff --git a/objectivec/Tests/GPBArrayTests.m b/objectivec/Tests/GPBArrayTests.m
index 713b8f6..efb512e 100644
--- a/objectivec/Tests/GPBArrayTests.m
+++ b/objectivec/Tests/GPBArrayTests.m
@@ -101,13 +101,11 @@
//% XCTAssertNotNil(array);
//% XCTAssertEqual(array.count, 0U);
//% XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-//% [array enumerateValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//% #pragma unused(value, idx, stop)
+//% [array enumerateValuesWithBlock:^(__unused TYPE value, __unused NSUInteger idx, __unused BOOL *stop) {
//% XCTFail(@"Shouldn't get here!");
//% }];
//% [array enumerateValuesWithOptions:NSEnumerationReverse
-//% usingBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//% #pragma unused(value, idx, stop)
+//% usingBlock:^(__unused TYPE value, __unused NSUInteger idx, __unused BOOL *stop) {
//% XCTFail(@"Shouldn't get here!");
//% }];
//% [array release];
@@ -445,13 +443,11 @@
XCTAssertNotNil(array);
XCTAssertEqual(array.count, 0U);
XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
- [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ [array enumerateValuesWithBlock:^(__unused int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array enumerateValuesWithOptions:NSEnumerationReverse
- usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ usingBlock:^(__unused int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array release];
@@ -789,13 +785,11 @@
XCTAssertNotNil(array);
XCTAssertEqual(array.count, 0U);
XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
- [array enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ [array enumerateValuesWithBlock:^(__unused uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array enumerateValuesWithOptions:NSEnumerationReverse
- usingBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ usingBlock:^(__unused uint32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array release];
@@ -1133,13 +1127,11 @@
XCTAssertNotNil(array);
XCTAssertEqual(array.count, 0U);
XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
- [array enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ [array enumerateValuesWithBlock:^(__unused int64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array enumerateValuesWithOptions:NSEnumerationReverse
- usingBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ usingBlock:^(__unused int64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array release];
@@ -1477,13 +1469,11 @@
XCTAssertNotNil(array);
XCTAssertEqual(array.count, 0U);
XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
- [array enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ [array enumerateValuesWithBlock:^(__unused uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array enumerateValuesWithOptions:NSEnumerationReverse
- usingBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ usingBlock:^(__unused uint64_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array release];
@@ -1821,13 +1811,11 @@
XCTAssertNotNil(array);
XCTAssertEqual(array.count, 0U);
XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
- [array enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ [array enumerateValuesWithBlock:^(__unused float value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array enumerateValuesWithOptions:NSEnumerationReverse
- usingBlock:^(float value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ usingBlock:^(__unused float value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array release];
@@ -2165,13 +2153,11 @@
XCTAssertNotNil(array);
XCTAssertEqual(array.count, 0U);
XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
- [array enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ [array enumerateValuesWithBlock:^(__unused double value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array enumerateValuesWithOptions:NSEnumerationReverse
- usingBlock:^(double value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ usingBlock:^(__unused double value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array release];
@@ -2509,13 +2495,11 @@
XCTAssertNotNil(array);
XCTAssertEqual(array.count, 0U);
XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
- [array enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ [array enumerateValuesWithBlock:^(__unused BOOL value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array enumerateValuesWithOptions:NSEnumerationReverse
- usingBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ usingBlock:^(__unused BOOL value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array release];
@@ -2853,13 +2837,11 @@
XCTAssertNotNil(array);
XCTAssertEqual(array.count, 0U);
XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
- [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ [array enumerateValuesWithBlock:^(__unused int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array enumerateValuesWithOptions:NSEnumerationReverse
- usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
- #pragma unused(value, idx, stop)
+ usingBlock:^(__unused int32_t value, __unused NSUInteger idx, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[array release];
diff --git a/objectivec/Tests/GPBDictionaryTests+Bool.m b/objectivec/Tests/GPBDictionaryTests+Bool.m
index ea4e79a..37f7eb3 100644
--- a/objectivec/Tests/GPBDictionaryTests+Bool.m
+++ b/objectivec/Tests/GPBDictionaryTests+Bool.m
@@ -58,8 +58,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt32:NULL forKey:YES]);
- [dict enumerateKeysAndUInt32sUsingBlock:^(BOOL aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused BOOL aKey, __unused uint32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -125,8 +124,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt32sUsingBlock:^(BOOL aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused BOOL aKey, __unused uint32_t aValue, BOOL *stop) {
if (idx == 0) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -363,8 +361,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt32:NULL forKey:YES]);
- [dict enumerateKeysAndInt32sUsingBlock:^(BOOL aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused BOOL aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -430,8 +427,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt32sUsingBlock:^(BOOL aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused BOOL aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 0) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -668,8 +664,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt64:NULL forKey:YES]);
- [dict enumerateKeysAndUInt64sUsingBlock:^(BOOL aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused BOOL aKey, __unused uint64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -735,8 +730,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt64sUsingBlock:^(BOOL aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused BOOL aKey, __unused uint64_t aValue, BOOL *stop) {
if (idx == 0) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -973,8 +967,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt64:NULL forKey:YES]);
- [dict enumerateKeysAndInt64sUsingBlock:^(BOOL aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused BOOL aKey, __unused int64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1040,8 +1033,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt64sUsingBlock:^(BOOL aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused BOOL aKey, __unused int64_t aValue, BOOL *stop) {
if (idx == 0) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1278,8 +1270,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getBool:NULL forKey:YES]);
- [dict enumerateKeysAndBoolsUsingBlock:^(BOOL aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused BOOL aKey, __unused BOOL aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1345,8 +1336,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndBoolsUsingBlock:^(BOOL aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused BOOL aKey, __unused BOOL aValue, BOOL *stop) {
if (idx == 0) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1583,8 +1573,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getFloat:NULL forKey:YES]);
- [dict enumerateKeysAndFloatsUsingBlock:^(BOOL aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused BOOL aKey, __unused float aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1650,8 +1639,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndFloatsUsingBlock:^(BOOL aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused BOOL aKey, __unused float aValue, BOOL *stop) {
if (idx == 0) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1888,8 +1876,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getDouble:NULL forKey:YES]);
- [dict enumerateKeysAndDoublesUsingBlock:^(BOOL aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused BOOL aKey, __unused double aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1955,8 +1942,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndDoublesUsingBlock:^(BOOL aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused BOOL aKey, __unused double aValue, BOOL *stop) {
if (idx == 0) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2193,8 +2179,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertNil([dict objectForKey:YES]);
- [dict enumerateKeysAndObjectsUsingBlock:^(BOOL aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject, stop)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused BOOL aKey, __unused NSString* aObject, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2252,8 +2237,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndObjectsUsingBlock:^(BOOL aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused BOOL aKey, __unused NSString* aObject, BOOL *stop) {
if (idx == 0) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
diff --git a/objectivec/Tests/GPBDictionaryTests+Int32.m b/objectivec/Tests/GPBDictionaryTests+Int32.m
index 0b46b0f..f08e213 100644
--- a/objectivec/Tests/GPBDictionaryTests+Int32.m
+++ b/objectivec/Tests/GPBDictionaryTests+Int32.m
@@ -89,8 +89,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt32:NULL forKey:11]);
- [dict enumerateKeysAndUInt32sUsingBlock:^(int32_t aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused int32_t aKey, __unused uint32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -160,8 +159,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt32sUsingBlock:^(int32_t aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused int32_t aKey, __unused uint32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -450,8 +448,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt32:NULL forKey:11]);
- [dict enumerateKeysAndInt32sUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused int32_t aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -521,8 +518,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt32sUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused int32_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -811,8 +807,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt64:NULL forKey:11]);
- [dict enumerateKeysAndUInt64sUsingBlock:^(int32_t aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused int32_t aKey, __unused uint64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -882,8 +877,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt64sUsingBlock:^(int32_t aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused int32_t aKey, __unused uint64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1172,8 +1166,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt64:NULL forKey:11]);
- [dict enumerateKeysAndInt64sUsingBlock:^(int32_t aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused int32_t aKey, __unused int64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1243,8 +1236,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt64sUsingBlock:^(int32_t aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused int32_t aKey, __unused int64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1533,8 +1525,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getBool:NULL forKey:11]);
- [dict enumerateKeysAndBoolsUsingBlock:^(int32_t aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused int32_t aKey, __unused BOOL aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1604,8 +1595,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndBoolsUsingBlock:^(int32_t aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused int32_t aKey, __unused BOOL aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1894,8 +1884,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getFloat:NULL forKey:11]);
- [dict enumerateKeysAndFloatsUsingBlock:^(int32_t aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused int32_t aKey, __unused float aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1965,8 +1954,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndFloatsUsingBlock:^(int32_t aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused int32_t aKey, __unused float aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2255,8 +2243,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getDouble:NULL forKey:11]);
- [dict enumerateKeysAndDoublesUsingBlock:^(int32_t aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused int32_t aKey, __unused double aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2326,8 +2313,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndDoublesUsingBlock:^(int32_t aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused int32_t aKey, __unused double aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2616,8 +2602,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getEnum:NULL forKey:11]);
- [dict enumerateKeysAndEnumsUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused int32_t aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2687,8 +2672,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndEnumsUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused int32_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -3045,8 +3029,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndRawValuesUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndRawValuesUsingBlock:^(__unused int32_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -3395,8 +3378,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertNil([dict objectForKey:11]);
- [dict enumerateKeysAndObjectsUsingBlock:^(int32_t aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject, stop)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused int32_t aKey, __unused NSString* aObject, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -3456,8 +3438,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndObjectsUsingBlock:^(int32_t aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused int32_t aKey, __unused NSString* aObject, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
diff --git a/objectivec/Tests/GPBDictionaryTests+Int64.m b/objectivec/Tests/GPBDictionaryTests+Int64.m
index 9456791..c052e1c 100644
--- a/objectivec/Tests/GPBDictionaryTests+Int64.m
+++ b/objectivec/Tests/GPBDictionaryTests+Int64.m
@@ -89,8 +89,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt32:NULL forKey:21LL]);
- [dict enumerateKeysAndUInt32sUsingBlock:^(int64_t aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused int64_t aKey, __unused uint32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -160,8 +159,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt32sUsingBlock:^(int64_t aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused int64_t aKey, __unused uint32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -450,8 +448,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt32:NULL forKey:21LL]);
- [dict enumerateKeysAndInt32sUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused int64_t aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -521,8 +518,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt32sUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused int64_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -811,8 +807,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt64:NULL forKey:21LL]);
- [dict enumerateKeysAndUInt64sUsingBlock:^(int64_t aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused int64_t aKey, __unused uint64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -882,8 +877,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt64sUsingBlock:^(int64_t aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused int64_t aKey, __unused uint64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1172,8 +1166,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt64:NULL forKey:21LL]);
- [dict enumerateKeysAndInt64sUsingBlock:^(int64_t aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused int64_t aKey, __unused int64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1243,8 +1236,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt64sUsingBlock:^(int64_t aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused int64_t aKey, __unused int64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1533,8 +1525,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getBool:NULL forKey:21LL]);
- [dict enumerateKeysAndBoolsUsingBlock:^(int64_t aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused int64_t aKey, __unused BOOL aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1604,8 +1595,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndBoolsUsingBlock:^(int64_t aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused int64_t aKey, __unused BOOL aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1894,8 +1884,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getFloat:NULL forKey:21LL]);
- [dict enumerateKeysAndFloatsUsingBlock:^(int64_t aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused int64_t aKey, __unused float aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1965,8 +1954,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndFloatsUsingBlock:^(int64_t aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused int64_t aKey, __unused float aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2255,8 +2243,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getDouble:NULL forKey:21LL]);
- [dict enumerateKeysAndDoublesUsingBlock:^(int64_t aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused int64_t aKey, __unused double aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2326,8 +2313,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndDoublesUsingBlock:^(int64_t aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused int64_t aKey, __unused double aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2616,8 +2602,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getEnum:NULL forKey:21LL]);
- [dict enumerateKeysAndEnumsUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused int64_t aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2687,8 +2672,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndEnumsUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused int64_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -3045,8 +3029,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndRawValuesUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndRawValuesUsingBlock:^(__unused int64_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -3395,8 +3378,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertNil([dict objectForKey:21LL]);
- [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject, stop)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused int64_t aKey, __unused NSString* aObject, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -3456,8 +3438,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused int64_t aKey, __unused NSString* aObject, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
diff --git a/objectivec/Tests/GPBDictionaryTests+String.m b/objectivec/Tests/GPBDictionaryTests+String.m
index 181dfc6..6c5d7b3 100644
--- a/objectivec/Tests/GPBDictionaryTests+String.m
+++ b/objectivec/Tests/GPBDictionaryTests+String.m
@@ -89,8 +89,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt32:NULL forKey:@"foo"]);
- [dict enumerateKeysAndUInt32sUsingBlock:^(NSString *aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused NSString *aKey, __unused uint32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -160,8 +159,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt32sUsingBlock:^(NSString *aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused NSString *aKey, __unused uint32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -450,8 +448,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt32:NULL forKey:@"foo"]);
- [dict enumerateKeysAndInt32sUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused NSString *aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -521,8 +518,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt32sUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused NSString *aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -811,8 +807,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt64:NULL forKey:@"foo"]);
- [dict enumerateKeysAndUInt64sUsingBlock:^(NSString *aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused NSString *aKey, __unused uint64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -882,8 +877,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt64sUsingBlock:^(NSString *aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused NSString *aKey, __unused uint64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1172,8 +1166,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt64:NULL forKey:@"foo"]);
- [dict enumerateKeysAndInt64sUsingBlock:^(NSString *aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused NSString *aKey, __unused int64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1243,8 +1236,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt64sUsingBlock:^(NSString *aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused NSString *aKey, __unused int64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1533,8 +1525,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getBool:NULL forKey:@"foo"]);
- [dict enumerateKeysAndBoolsUsingBlock:^(NSString *aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused NSString *aKey, __unused BOOL aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1604,8 +1595,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndBoolsUsingBlock:^(NSString *aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused NSString *aKey, __unused BOOL aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1894,8 +1884,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getFloat:NULL forKey:@"foo"]);
- [dict enumerateKeysAndFloatsUsingBlock:^(NSString *aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused NSString *aKey, __unused float aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1965,8 +1954,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndFloatsUsingBlock:^(NSString *aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused NSString *aKey, __unused float aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2255,8 +2243,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getDouble:NULL forKey:@"foo"]);
- [dict enumerateKeysAndDoublesUsingBlock:^(NSString *aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused NSString *aKey, __unused double aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2326,8 +2313,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndDoublesUsingBlock:^(NSString *aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused NSString *aKey, __unused double aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2616,8 +2602,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getEnum:NULL forKey:@"foo"]);
- [dict enumerateKeysAndEnumsUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused NSString *aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2687,8 +2672,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndEnumsUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused NSString *aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -3045,8 +3029,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndRawValuesUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndRawValuesUsingBlock:^(__unused NSString *aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
diff --git a/objectivec/Tests/GPBDictionaryTests+UInt32.m b/objectivec/Tests/GPBDictionaryTests+UInt32.m
index edc2e74..854d49b 100644
--- a/objectivec/Tests/GPBDictionaryTests+UInt32.m
+++ b/objectivec/Tests/GPBDictionaryTests+UInt32.m
@@ -89,8 +89,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt32:NULL forKey:1U]);
- [dict enumerateKeysAndUInt32sUsingBlock:^(uint32_t aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused uint32_t aKey, __unused uint32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -160,8 +159,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt32sUsingBlock:^(uint32_t aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused uint32_t aKey, __unused uint32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -450,8 +448,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt32:NULL forKey:1U]);
- [dict enumerateKeysAndInt32sUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused uint32_t aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -521,8 +518,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt32sUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused uint32_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -811,8 +807,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt64:NULL forKey:1U]);
- [dict enumerateKeysAndUInt64sUsingBlock:^(uint32_t aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused uint32_t aKey, __unused uint64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -882,8 +877,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt64sUsingBlock:^(uint32_t aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused uint32_t aKey, __unused uint64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1172,8 +1166,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt64:NULL forKey:1U]);
- [dict enumerateKeysAndInt64sUsingBlock:^(uint32_t aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused uint32_t aKey, __unused int64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1243,8 +1236,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt64sUsingBlock:^(uint32_t aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused uint32_t aKey, __unused int64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1533,8 +1525,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getBool:NULL forKey:1U]);
- [dict enumerateKeysAndBoolsUsingBlock:^(uint32_t aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused uint32_t aKey, __unused BOOL aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1604,8 +1595,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndBoolsUsingBlock:^(uint32_t aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused uint32_t aKey, __unused BOOL aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1894,8 +1884,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getFloat:NULL forKey:1U]);
- [dict enumerateKeysAndFloatsUsingBlock:^(uint32_t aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused uint32_t aKey, __unused float aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1965,8 +1954,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndFloatsUsingBlock:^(uint32_t aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused uint32_t aKey, __unused float aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2255,8 +2243,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getDouble:NULL forKey:1U]);
- [dict enumerateKeysAndDoublesUsingBlock:^(uint32_t aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused uint32_t aKey, __unused double aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2326,8 +2313,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndDoublesUsingBlock:^(uint32_t aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused uint32_t aKey, __unused double aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2616,8 +2602,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getEnum:NULL forKey:1U]);
- [dict enumerateKeysAndEnumsUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused uint32_t aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2687,8 +2672,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndEnumsUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused uint32_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -3045,8 +3029,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndRawValuesUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndRawValuesUsingBlock:^(__unused uint32_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -3395,8 +3378,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertNil([dict objectForKey:1U]);
- [dict enumerateKeysAndObjectsUsingBlock:^(uint32_t aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject, stop)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused uint32_t aKey, __unused NSString* aObject, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -3456,8 +3438,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndObjectsUsingBlock:^(uint32_t aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused uint32_t aKey, __unused NSString* aObject, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
diff --git a/objectivec/Tests/GPBDictionaryTests+UInt64.m b/objectivec/Tests/GPBDictionaryTests+UInt64.m
index 7f6c983..fe7d4fc 100644
--- a/objectivec/Tests/GPBDictionaryTests+UInt64.m
+++ b/objectivec/Tests/GPBDictionaryTests+UInt64.m
@@ -89,8 +89,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt32:NULL forKey:31ULL]);
- [dict enumerateKeysAndUInt32sUsingBlock:^(uint64_t aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused uint64_t aKey, __unused uint32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -160,8 +159,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt32sUsingBlock:^(uint64_t aKey, uint32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt32sUsingBlock:^(__unused uint64_t aKey, __unused uint32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -450,8 +448,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt32:NULL forKey:31ULL]);
- [dict enumerateKeysAndInt32sUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused uint64_t aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -521,8 +518,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt32sUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt32sUsingBlock:^(__unused uint64_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -811,8 +807,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getUInt64:NULL forKey:31ULL]);
- [dict enumerateKeysAndUInt64sUsingBlock:^(uint64_t aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused uint64_t aKey, __unused uint64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -882,8 +877,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndUInt64sUsingBlock:^(uint64_t aKey, uint64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndUInt64sUsingBlock:^(__unused uint64_t aKey, __unused uint64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1172,8 +1166,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getInt64:NULL forKey:31ULL]);
- [dict enumerateKeysAndInt64sUsingBlock:^(uint64_t aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused uint64_t aKey, __unused int64_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1243,8 +1236,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndInt64sUsingBlock:^(uint64_t aKey, int64_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndInt64sUsingBlock:^(__unused uint64_t aKey, __unused int64_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1533,8 +1525,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getBool:NULL forKey:31ULL]);
- [dict enumerateKeysAndBoolsUsingBlock:^(uint64_t aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused uint64_t aKey, __unused BOOL aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1604,8 +1595,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndBoolsUsingBlock:^(uint64_t aKey, BOOL aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndBoolsUsingBlock:^(__unused uint64_t aKey, __unused BOOL aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -1894,8 +1884,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getFloat:NULL forKey:31ULL]);
- [dict enumerateKeysAndFloatsUsingBlock:^(uint64_t aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused uint64_t aKey, __unused float aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -1965,8 +1954,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndFloatsUsingBlock:^(uint64_t aKey, float aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndFloatsUsingBlock:^(__unused uint64_t aKey, __unused float aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2255,8 +2243,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getDouble:NULL forKey:31ULL]);
- [dict enumerateKeysAndDoublesUsingBlock:^(uint64_t aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused uint64_t aKey, __unused double aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2326,8 +2313,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndDoublesUsingBlock:^(uint64_t aKey, double aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndDoublesUsingBlock:^(__unused uint64_t aKey, __unused double aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -2616,8 +2602,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertFalse([dict getEnum:NULL forKey:31ULL]);
- [dict enumerateKeysAndEnumsUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue, stop)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused uint64_t aKey, __unused int32_t aValue, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -2687,8 +2672,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndEnumsUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndEnumsUsingBlock:^(__unused uint64_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -3045,8 +3029,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndRawValuesUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
- #pragma unused(aKey, aValue)
+ [dict enumerateKeysAndRawValuesUsingBlock:^(__unused uint64_t aKey, __unused int32_t aValue, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
@@ -3395,8 +3378,7 @@
XCTAssertNotNil(dict);
XCTAssertEqual(dict.count, 0U);
XCTAssertNil([dict objectForKey:31ULL]);
- [dict enumerateKeysAndObjectsUsingBlock:^(uint64_t aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject, stop)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused uint64_t aKey, __unused NSString* aObject, __unused BOOL *stop) {
XCTFail(@"Shouldn't get here!");
}];
[dict release];
@@ -3456,8 +3438,7 @@
// Stopping the enumeration.
idx = 0;
- [dict enumerateKeysAndObjectsUsingBlock:^(uint64_t aKey, NSString* aObject, BOOL *stop) {
- #pragma unused(aKey, aObject)
+ [dict enumerateKeysAndObjectsUsingBlock:^(__unused uint64_t aKey, __unused NSString* aObject, BOOL *stop) {
if (idx == 1) *stop = YES;
XCTAssertNotEqual(idx, 2U);
++idx;
diff --git a/objectivec/Tests/GPBDictionaryTests.pddm b/objectivec/Tests/GPBDictionaryTests.pddm
index 17f12c2..11c08ec 100644
--- a/objectivec/Tests/GPBDictionaryTests.pddm
+++ b/objectivec/Tests/GPBDictionaryTests.pddm
@@ -70,8 +70,7 @@
//% XCTAssertNotNil(dict);
//% XCTAssertEqual(dict.count, 0U);
//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY1)
-//% [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u, BOOL *stop) {
-//% #pragma unused(aKey, a##VNAME$u, stop)
+//% [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(__unused KEY_TYPE KisP##aKey, __unused VALUE_TYPE a##VNAME$u, __unused BOOL *stop) {
//% XCTFail(@"Shouldn't get here!");
//% }];
//% [dict release];
@@ -131,8 +130,7 @@
//%
//% // Stopping the enumeration.
//% idx = 0;
-//% [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u, BOOL *stop) {
-//% #pragma unused(aKey, a##VNAME$u)
+//% [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(__unused KEY_TYPE KisP##aKey, __unused VALUE_TYPE a##VNAME$u, BOOL *stop) {
//% if (idx == 1) *stop = YES;
//% XCTAssertNotEqual(idx, 2U);
//% ++idx;
@@ -425,8 +423,7 @@
//%
//% // Stopping the enumeration.
//% idx = 0;
-//% [dict enumerateKeysAndRawValuesUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE aValue, BOOL *stop) {
-//% #pragma unused(aKey, aValue)
+//% [dict enumerateKeysAndRawValuesUsingBlock:^(__unused KEY_TYPE KisP##aKey, __unused VALUE_TYPE aValue, BOOL *stop) {
//% if (idx == 1) *stop = YES;
//% XCTAssertNotEqual(idx, 2U);
//% ++idx;
@@ -790,8 +787,7 @@
//% XCTAssertNotNil(dict);
//% XCTAssertEqual(dict.count, 0U);
//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY1)
-//% [dict enumerateKeysAnd##VALUE_NAME##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u##, BOOL *stop) {
-//% #pragma unused(aKey, a##VNAME$u##, stop)
+//% [dict enumerateKeysAnd##VALUE_NAME##sUsingBlock:^(__unused KEY_TYPE KisP##aKey, __unused VALUE_TYPE a##VNAME$u##, __unused BOOL *stop) {
//% XCTFail(@"Shouldn't get here!");
//% }];
//% [dict release];
@@ -849,8 +845,7 @@
//%
//% // Stopping the enumeration.
//% idx = 0;
-//% [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u##, BOOL *stop) {
-//% #pragma unused(aKey, a##VNAME$u)
+//% [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(__unused KEY_TYPE KisP##aKey, __unused VALUE_TYPE a##VNAME$u##, BOOL *stop) {
//% if (idx == 0) *stop = YES;
//% XCTAssertNotEqual(idx, 2U);
//% ++idx;
diff --git a/objectivec/Tests/GPBMessageTests+Runtime.m b/objectivec/Tests/GPBMessageTests+Runtime.m
index af28af3..3bcfae0 100644
--- a/objectivec/Tests/GPBMessageTests+Runtime.m
+++ b/objectivec/Tests/GPBMessageTests+Runtime.m
@@ -2600,8 +2600,7 @@
// Ensure the messages are unique per map.
[msg1.mapInt32ForeignMessage
- enumerateKeysAndObjectsUsingBlock:^(int32_t key, id value, BOOL *stop) {
-#pragma unused(stop)
+ enumerateKeysAndObjectsUsingBlock:^(int32_t key, id value, __unused BOOL *stop) {
ForeignMessage *subMsg2 = [msg2.mapInt32ForeignMessage objectForKey:key];
XCTAssertNotEqual(value, subMsg2); // Ptr compare, new object.
}];
diff --git a/objectivec/Tests/GPBMessageTests.m b/objectivec/Tests/GPBMessageTests.m
index cf0474e..83b8d11 100644
--- a/objectivec/Tests/GPBMessageTests.m
+++ b/objectivec/Tests/GPBMessageTests.m
@@ -74,12 +74,9 @@
}
- (void)observeValueForKeyPath:(NSString *)keyPath
- ofObject:(id)object
- change:(NSDictionary *)change
- context:(void *)context {
-#pragma unused(object)
-#pragma unused(change)
-#pragma unused(context)
+ ofObject:(__unused id)object
+ change:(__unused NSDictionary *)change
+ context:(__unused void *)context {
if ([keyPath isEqualToString:keyPath_]) {
self.didObserve = YES;
}
