commit 5a52b3588d35d2fa0b9ce4eda5630546966a26b4
author Thomas Van Lenten <thomasvl@google.com> Thu Jun 29 11:52:37 2017 -0400
committer GitHub <noreply@github.com> Thu Jun 29 11:52:37 2017 -0400
tree 3b9764f944af58a7f67a3c7ac0f1bbffb9d4cf5c
parent 176bac6dac03f8dc728fd9c7a0fbc96aedfed7d1
parent e55782fa950b4dbdbefff8faaa22da1effd2368b

Merge pull request #3287 from sergiocampama/initialized

Add initialized as a reserved keyword as that's the actual property name

src/google/protobuf/compiler/objectivec/objectivec_helpers.cc

diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
index 1ea2676..bb8170a 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
@@ -196,7 +196,7 @@
     // 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