From 07c284f86c28825115e81435227473da426240c0 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Thu, 27 Apr 2017 11:35:59 -0700 Subject: Fully qualify min as std::min in wire_format_lite.cc --- src/google/protobuf/wire_format_lite.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/google/protobuf/wire_format_lite.cc') 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); -- cgit v1.2.3