Merge pull request #3287 from sergiocampama/initialized

Add initialized as a reserved keyword as that's the actual property name
8 years ago · 5a52b3588d
parent 176bac6dac e55782fa95
commit 5a52b3588d
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
@ -196,7 +196,7 @@ const char* const kReservedWordList[] = {
    // method declared in protos. The main cases are methods
    // that take no arguments, or setFoo:/hasFoo: type methods.
    "clear", "data", "delimitedData", "descriptor", "extensionRegistry",
-    "extensionsCurrentlySet", "isInitialized", "serializedSize",
+    "extensionsCurrentlySet", "initialized", "isInitialized", "serializedSize",
    "sortedExtensionsInUse", "unknownFields",

    // MacTypes.h names