diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2017-06-20 22:53:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 22:53:22 -0700 |
| commit | 8ecae34ac65218e9fda1586abc39f8762dbb40de (patch) | |
| tree | f5ebd70dd889b94872f0e4fe75704d21998dd4cd /src/google | |
| parent | bf04c83267619b618e7112b242f424f8b3e785b6 (diff) | |
| parent | 3b1a87518cead7403b8e13c41945e41a30d602e4 (diff) | |
| download | protobuf-8ecae34ac65218e9fda1586abc39f8762dbb40de.tar.gz protobuf-8ecae34ac65218e9fda1586abc39f8762dbb40de.tar.bz2 protobuf-8ecae34ac65218e9fda1586abc39f8762dbb40de.zip | |
Merge pull request #3255 from TeBoring/3.3.x-3
Cherry-pick bug fixes for php
Diffstat (limited to 'src/google')
| -rw-r--r-- | src/google/protobuf/compiler/php/php_generator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc index ea850c0f..f8e7e5f0 100644 --- a/src/google/protobuf/compiler/php/php_generator.cc +++ b/src/google/protobuf/compiler/php/php_generator.cc @@ -49,8 +49,8 @@ const std::string kDescriptorMetadataFile = "GPBMetadata/Google/Protobuf/Internal/Descriptor.php"; const std::string kDescriptorDirName = "Google/Protobuf/Internal"; const std::string kDescriptorPackageName = "Google\\Protobuf\\Internal"; -const char* const kReservedNames[] = {"Empty", "ECHO"}; -const int kReservedNamesSize = 2; +const char* const kReservedNames[] = {"ARRAY", "Empty", "ECHO"}; +const int kReservedNamesSize = 3; namespace google { namespace protobuf { |