diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-14 18:33:38 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-16 13:38:10 -0800 |
| commit | a0cecfd31a091ba6b95f4dfffe191c0aa033a54f (patch) | |
| tree | c32ef76b91938e14a1c55f71a07df103ed260957 /src/google/protobuf/util/internal/json_escaping.cc | |
| parent | 13e1279d8674c71a5704d04e46a1d469efad7180 (diff) | |
| download | protobuf-a0cecfd31a091ba6b95f4dfffe191c0aa033a54f.tar.gz protobuf-a0cecfd31a091ba6b95f4dfffe191c0aa033a54f.tar.bz2 protobuf-a0cecfd31a091ba6b95f4dfffe191c0aa033a54f.zip | |
Make conformance tests build for C++ and Java.
Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
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 36dc8ef9..24bd554e 100644 --- a/src/google/protobuf/util/internal/json_escaping.cc +++ b/src/google/protobuf/util/internal/json_escaping.cc @@ -186,7 +186,7 @@ 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 = str[index++]; + *cp = static_cast<uint8>(str[index++]); *num_read = 1; // The length of the code point is determined from reading the first byte. // @@ -235,7 +235,7 @@ bool ReadCodePoint(StringPiece str, int index, *num_read = 0; } while (*num_left > 0 && index < str.size()) { - uint32 ch = str[index++]; + uint32 ch = static_cast<uint8>(str[index++]); --(*num_left); ++(*num_read); *cp = (*cp << 6) | (ch & 0x3f); |