diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
| commit | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (patch) | |
| tree | e575738adf52d24b883cca5e8928a5ded31caba1 /src/google/protobuf/util/internal/json_escaping.cc | |
| parent | e7746f487cb9cca685ffb1b3d7dccc5554b618a4 (diff) | |
| download | protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.gz protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.bz2 protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.zip | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/util/internal/json_escaping.cc')
| -rw-r--r-- | src/google/protobuf/util/internal/json_escaping.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/util/internal/json_escaping.cc b/src/google/protobuf/util/internal/json_escaping.cc index 06b9a7f2..d1673597 100644 --- a/src/google/protobuf/util/internal/json_escaping.cc +++ b/src/google/protobuf/util/internal/json_escaping.cc @@ -134,8 +134,8 @@ inline uint16 ToHighSurrogate(uint32 cp) { // Returns false if we encounter an invalid UTF-8 string. Returns true // otherwise, including the case when we reach the end of the input (str) // before a complete unicode code point is read. -bool ReadCodePoint(StringPiece str, int index, - uint32 *cp, int* num_left, int *num_read) { +bool ReadCodePoint(StringPiece str, int index, uint32* cp, int* num_left, + int* num_read) { if (*num_left == 0) { // Last read was complete. Start reading a new unicode code point. *cp = static_cast<uint8>(str[index++]); |