Merge pull request #3023 from acozzette/min

Fully qualify min as std::min in wire_format_lite.cc
8 years ago · 067b1eec3b
parent cbd08cb7d1 07c284f86c
commit 067b1eec3b
1 changed files with 1 additions and 1 deletions
--- 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);