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

xfa/src/fgas/src/crt/fx_memory.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 "xfa/src/fgas/src/fgas_base.h"
 #include "fx_memory.h"
 #define FX_4BYTEALIGN(size) (((size) + 3) / 4 * 4)
 IFX_MEMAllocator* FX_CreateAllocator(FX_ALLOCTYPE eType,
                                      size_t chunkSize,
                                      size_t blockSize) {
   switch (eType) {
 #ifndef _FXEMB
     case FX_ALLOCTYPE_Dynamic:
       return new CFX_DynamicStore(chunkSize);
@@ skipping 35 matching lines @@
     m_pChunk = pChunk;
   } else {
     m_pLastChunk->pNextChunk = pChunk;
   }
   m_pLastChunk = pChunk;
   return pChunk;
 }
 FX_LPSTATICSTORECHUNK CFX_StaticStore::FindChunk(size_t size) {
   FXSYS_assert(size != 0);
   if (m_pLastChunk == NULL || m_pLastChunk->iFreeSize < size) {
-    return AllocChunk(FX_MAX(m_iDefChunkSize, size));
+    return AllocChunk(std::max(m_iDefChunkSize, size));
   }
   return m_pLastChunk;
 }
 void* CFX_StaticStore::Alloc(size_t size) {
   size = FX_4BYTEALIGN(size);
   FXSYS_assert(size != 0);
   FX_LPSTATICSTORECHUNK pChunk = FindChunk(size);
   FXSYS_assert(pChunk != NULL && pChunk->iFreeSize >= size);
   uint8_t* p = (uint8_t*)pChunk;
   p += sizeof(FX_STATICSTORECHUNK) + pChunk->iChunkSize - pChunk->iFreeSize;
@@ skipping 162 matching lines @@
         }
         pBlock = pBlock->NextBlock();
       }
       if (bFind) {
         break;
       }
     }
     pChunk = pChunk->pNextChunk;
   }
   if (pChunk == NULL) {
-    pChunk = AllocChunk(FX_MAX(m_iDefChunkSize, size));
+    pChunk = AllocChunk(std::max(m_iDefChunkSize, size));
     pBlock = pChunk->FirstBlock();
   }
   FXSYS_assert(pChunk != NULL && pBlock != NULL);
   size_t m = size + sizeof(FX_DYNAMICSTOREBLOCK);
   pBlock->bUsed = TRUE;
   if (pBlock->iBlockSize > m) {
     size_t n = pBlock->iBlockSize;
     pBlock->iBlockSize = size;
     FX_LPDYNAMICSTOREBLOCK pNextBlock = pBlock->NextBlock();
     pNextBlock->bUsed = FALSE;
@@ skipping 57 matching lines @@
     FX_Free(pChunk);
   }
 }
 size_t CFX_DynamicStore::SetDefChunkSize(size_t size) {
   FXSYS_assert(size != 0);
   size_t v = m_iDefChunkSize;
   m_iDefChunkSize = size;
   return v;
 }
 #endif