aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Yang <TeBoring@users.noreply.github.com>2017-05-29 15:30:47 -0700
committerBo Yang <teboring@google.com>2017-06-20 15:06:22 -0700
commitdba8928ff53ae372bba3d928a6145754a97238d5 (patch)
tree4177a3467bd1120fa99e5dfccb59c7b1f0c1b7ca /src
parentbf04c83267619b618e7112b242f424f8b3e785b6 (diff)
downloadprotobuf-dba8928ff53ae372bba3d928a6145754a97238d5.tar.gz
protobuf-dba8928ff53ae372bba3d928a6145754a97238d5.tar.bz2
protobuf-dba8928ff53ae372bba3d928a6145754a97238d5.zip
Add ARRAY for reserved name (#3150)
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/compiler/php/php_generator.cc4
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 {