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/io/zero_copy_stream_impl_lite.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/io/zero_copy_stream_impl_lite.cc')
| -rw-r--r-- | src/google/protobuf/io/zero_copy_stream_impl_lite.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/io/zero_copy_stream_impl_lite.cc b/src/google/protobuf/io/zero_copy_stream_impl_lite.cc index 66ad49bc..7d7b689b 100644 --- a/src/google/protobuf/io/zero_copy_stream_impl_lite.cc +++ b/src/google/protobuf/io/zero_copy_stream_impl_lite.cc @@ -37,9 +37,9 @@ #include <algorithm> #include <limits> -#include <google/protobuf/stubs/casts.h> #include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/logging.h> +#include <google/protobuf/stubs/casts.h> #include <google/protobuf/stubs/stl_util.h> namespace google { @@ -200,8 +200,8 @@ int CopyingInputStream::Skip(int count) { char junk[4096]; int skipped = 0; while (skipped < count) { - int bytes = - Read(junk, std::min(count - skipped, implicit_cast<int>(sizeof(junk)))); + int bytes = Read(junk, std::min(count - skipped, + ::google::protobuf::implicit_cast<int>(sizeof(junk)))); if (bytes <= 0) { // EOF or read error. return skipped; |