Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: third_party/protobuf/src/google/protobuf/stubs/strutil.cc

Issue 2885223002: Protobuf: Remove protobuf globals patch (Closed)
Patch Set: typo Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/src/google/protobuf/stubs/structurally_valid.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/src/google/protobuf/stubs/strutil.cc
diff --git a/third_party/protobuf/src/google/protobuf/stubs/strutil.cc b/third_party/protobuf/src/google/protobuf/stubs/strutil.cc
index 25efb10ac2fe53f4d45702a11c988b68cdf8e157..7ba92e8f1fa4d95dd77feb4a14abe6aa1326c1b7 100644
--- a/third_party/protobuf/src/google/protobuf/stubs/strutil.cc
+++ b/third_party/protobuf/src/google/protobuf/stubs/strutil.cc
@@ -528,7 +528,7 @@ int CEscapeInternal(const char* src, int src_len, char* dest,
// Assumes that non-printable characters are escaped using octal sequences, and
// that UTF-8 bytes are not handled specially.
static inline size_t CEscapedLength(StringPiece src) {
- static const char c_escaped_len[256] = {
+ static char c_escaped_len[256] = {
4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 4, 4, 2, 4, 4, // \t, \n, \r
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
1, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // ", '
@@ -891,7 +891,7 @@ char *FastInt32ToBuffer(int32 i, char* buffer) {
char *FastHexToBuffer(int i, char* buffer) {
GOOGLE_CHECK(i >= 0) << "FastHexToBuffer() wants non-negative integers, not " << i;
- static const char hexdigits[] = "0123456789abcdef";
+ static const char *hexdigits = "0123456789abcdef";
char *p = buffer + 21;
*p-- = '\0';
do {
@@ -902,7 +902,7 @@ char *FastHexToBuffer(int i, char* buffer) {
}
char *InternalFastHexToBuffer(uint64 value, char* buffer, int num_byte) {
- static const char hexdigits[] = "0123456789abcdef";
+ static const char *hexdigits = "0123456789abcdef";
buffer[num_byte] = '\0';
for (int i = num_byte - 1; i >= 0; i--) {
#ifdef _M_X64
« no previous file with comments | « third_party/protobuf/src/google/protobuf/stubs/structurally_valid.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698