diff options
| author |  Bo Yang <teboring@google.com> | 2015-09-15 18:25:02 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-10-04 13:22:54 -0700 |
| commit | 7c14dc837b2fcd61ed244ced90debeb4b42d1119 (patch) | |
| tree | ebaea9d0a20b315f4f372136200494d4aff3936c /src/google/protobuf/stubs/common.h | |
| parent | fbabf987e671aa37d11e1163e0175f99b32df5fe (diff) | |
Down-integrate internal bug fixing changes.
Diffstat (limited to 'src/google/protobuf/stubs/common.h')
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 88e7084f..9c05cac3 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -146,7 +146,7 @@ namespace internal { LIBPROTOBUF_EXPORT bool IsStructurallyValidUTF8(const char* buf, int len); inline bool IsStructurallyValidUTF8(const std::string& str) { - return IsStructurallyValidUTF8(str.data(), str.length()); + return IsStructurallyValidUTF8(str.data(), static_cast<int>(str.length())); } // Returns initial number of bytes of structually valid UTF-8. |