diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-04-27 11:35:59 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-04-27 11:35:59 -0700 |
| commit | 07c284f86c28825115e81435227473da426240c0 (patch) | |
| tree | 77e4a3a63307ac9dfb367f27bd6ace5fdefe0390 | |
| parent | cbd08cb7d11fabbdf471d49ed13e5082033bd2b5 (diff) | |
Fully qualify min as std::min in wire_format_lite.cc
| -rw-r--r-- | src/google/protobuf/wire_format_lite.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/wire_format_lite.cc b/src/google/protobuf/wire_format_lite.cc index e46ac400..2299d51e 100644 --- a/src/google/protobuf/wire_format_lite.cc +++ b/src/google/protobuf/wire_format_lite.cc @@ -378,7 +378,7 @@ static void WriteArray(const CType* a, int n, io::CodedOutputStream* output) { const int kAtATime = 128; uint8 buf[sizeof(CType) * kAtATime]; for (int i = 0; i < n; i += kAtATime) { - int to_do = min(kAtATime, n - i); + int to_do = std::min(kAtATime, n - i); uint8* ptr = buf; for (int j = 0; j < to_do; j++) { EncodeFixedSizeValue(a[i+j], ptr); |