diff options
| author |  Adam Cozzette <acozzette@google.com> | 2016-06-29 15:23:27 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-06-29 15:38:03 -0700 |
| commit | d64a2d9941c36a7bc2a7959ea10ab8363192ac14 (patch) | |
| tree | 52330d146ad63d3d70f3baade00d5d1fea8f5e0c /src/google/protobuf/util/internal/json_escaping.cc | |
| parent | c18aa7795a2e02ef700ff8b039d94ecdcc33432f (diff) | |
Integrated internal changes from Google
This includes all internal changes from around May 20 to now.
Diffstat (limited to 'src/google/protobuf/util/internal/json_escaping.cc')
| -rw-r--r-- | src/google/protobuf/util/internal/json_escaping.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/json_escaping.cc b/src/google/protobuf/util/internal/json_escaping.cc index 24bd554e..06d2791b 100644 --- a/src/google/protobuf/util/internal/json_escaping.cc +++ b/src/google/protobuf/util/internal/json_escaping.cc @@ -255,7 +255,7 @@ StringPiece ToHex(uint16 cp, char* buffer) { buffer[3] = kHex[cp & 0x0f]; cp >>= 4; buffer[2] = kHex[cp & 0x0f]; - return StringPiece(buffer, 0, 6); + return StringPiece(buffer).substr(0, 6); } // Stores the 32-bit unicode code point as its hexadecimal digits in buffer |