aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Yang <TeBoring@users.noreply.github.com>2017-05-29 15:30:47 -0700
committerGitHub <noreply@github.com>2017-05-29 15:30:47 -0700
commit282fb9e68ec101b7b7616a45279427944afc3e6b (patch)
treebb7d92efef2d228e62c47ec3ce8951c8fd567b0b /src
parent4d5daf4ef97918176b892dbedce17b1d854ffe8e (diff)
downloadprotobuf-282fb9e68ec101b7b7616a45279427944afc3e6b.tar.gz
protobuf-282fb9e68ec101b7b7616a45279427944afc3e6b.tar.bz2
protobuf-282fb9e68ec101b7b7616a45279427944afc3e6b.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 54fafc40..cbddee9e 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 {