Merge to XFA: Switch most min/max macros to std::min/max.

core/src/fxcrt/fx_basic_buffer.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include <algorithm>
+
 #include "core/include/fxcrt/fx_basic.h"
 
 FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf);
 CFX_BinaryBuf::CFX_BinaryBuf()
     : m_AllocStep(0), m_pBuffer(NULL), m_DataSize(0), m_AllocSize(0) {}
 CFX_BinaryBuf::CFX_BinaryBuf(FX_STRSIZE size)
     : m_AllocStep(0), m_DataSize(size), m_AllocSize(size) {
   m_pBuffer = FX_Alloc(uint8_t, size);
 }
 CFX_BinaryBuf::~CFX_BinaryBuf() {
@@ skipping 377 matching lines @@
 int32_t IFX_BufferArchive::AppendBlock(const void* pBuf, size_t size) {
   if (!pBuf || size < 1) {
     return 0;
   }
   if (!m_pBuffer) {
     m_pBuffer = FX_Alloc(uint8_t, m_BufSize);
   }
   uint8_t* buffer = (uint8_t*)pBuf;
   FX_STRSIZE temp_size = (FX_STRSIZE)size;
   while (temp_size > 0) {
-    FX_STRSIZE buf_size = FX_MIN(m_BufSize - m_Length, (FX_STRSIZE)temp_size);
+    FX_STRSIZE buf_size = std::min(m_BufSize - m_Length, (FX_STRSIZE)temp_size);
     FXSYS_memcpy(m_pBuffer + m_Length, buffer, buf_size);
     m_Length += buf_size;
     if (m_Length == m_BufSize) {
       if (!Flush()) {
         return -1;
       }
     }
     temp_size -= buf_size;
     buffer += buf_size;
   }
@@ skipping 37 matching lines @@
 }
 FX_BOOL CFX_FileBufferArchive::DoWork(const void* pBuf, size_t size) {
   if (!m_pFile) {
     return FALSE;
   }
   if (!pBuf || size < 1) {
     return TRUE;
   }
   return m_pFile->WriteBlock(pBuf, size);
 }