aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2018-01-31 13:58:11 -0500
committerThomas Van Lenten <thomasvl@google.com>2018-01-31 14:24:51 -0500
commitd83837ded558bc2fd2b61a5f51ed52e4606345aa (patch)
treeab509f8a2938a9e6f1d6aaa68c2afe821c517da2 /src
parent81aeed082ecc35b62f1808234f4a0dd347775b33 (diff)
downloadprotobuf-d83837ded558bc2fd2b61a5f51ed52e4606345aa.tar.gz
protobuf-d83837ded558bc2fd2b61a5f51ed52e4606345aa.tar.bz2
protobuf-d83837ded558bc2fd2b61a5f51ed52e4606345aa.zip
Fix to use "nil" instead of "NULL" for objc objects.
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/compiler/objectivec/objectivec_enum.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_enum.cc b/src/google/protobuf/compiler/objectivec/objectivec_enum.cc
index 95e53f19..978e985c 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_enum.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_enum.cc
@@ -149,7 +149,7 @@ void EnumGenerator::GenerateSource(io::Printer* printer) {
printer->Print(
"GPBEnumDescriptor *$name$_EnumDescriptor(void) {\n"
- " static _Atomic(GPBEnumDescriptor*) descriptor = NULL;\n"
+ " static _Atomic(GPBEnumDescriptor*) descriptor = nil;\n"
" if (!descriptor) {\n",
"name", name_);