diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2017-06-29 11:52:37 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-06-29 11:52:37 -0400 |
| commit | 5a52b3588d35d2fa0b9ce4eda5630546966a26b4 (patch) | |
| tree | 3b9764f944af58a7f67a3c7ac0f1bbffb9d4cf5c | |
| parent | 176bac6dac03f8dc728fd9c7a0fbc96aedfed7d1 (diff) | |
| parent | e55782fa950b4dbdbefff8faaa22da1effd2368b (diff) | |
Merge pull request #3287 from sergiocampama/initialized
Add initialized as a reserved keyword as that's the actual property name
| -rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_helpers.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc index 1ea2676a..bb8170a9 100644 --- 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 |