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

core/src/fxcrt/fx_basic_wstring.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 <stddef.h>  // For offsetof().
+
+#include <algorithm>
 #include <cctype>
 
 #include "core/include/fxcrt/fx_basic.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "third_party/base/numerics/safe_math.h"
 
 // static
 CFX_WideString::StringData* CFX_WideString::StringData::Create(int nLen) {
   // TODO(palmer): |nLen| should really be declared as |size_t|, or
   // at least unsigned.
@@ skipping 614 matching lines @@
       const FX_WCHAR* pstr = m_pData->m_String;
       m_pData = StringData::Create(nNewLength);
       if (!m_pData) {
         return 0;
       }
       FXSYS_memcpy(m_pData->m_String, pstr,
                    pOldData->m_nDataLength * sizeof(FX_WCHAR));
       pOldData->Release();
     }
     lpszStart = m_pData->m_String;
-    lpszEnd = m_pData->m_String + FX_MAX(m_pData->m_nDataLength, nNewLength);
+    lpszEnd = m_pData->m_String + std::max(m_pData->m_nDataLength, nNewLength);
     {
       while ((lpszTarget = (FX_WCHAR*)FXSYS_wcsstr(lpszStart, lpszOld)) !=
                  NULL &&
              lpszStart < lpszEnd) {
         FX_STRSIZE nBalance =
             nOldLength -
             (FX_STRSIZE)(lpszTarget - m_pData->m_String + nSourceLen);
         FXSYS_memmove(lpszTarget + nReplacementLen, lpszTarget + nSourceLen,
                       nBalance * sizeof(FX_WCHAR));
         FXSYS_memcpy(lpszTarget, lpszNew, nReplacementLen * sizeof(FX_WCHAR));
@@ skipping 98 matching lines @@
       nMaxLen += FXSYS_wcslen(lpsz);
       continue;
     }
     int nItemLen = 0;
     int nWidth = 0;
     for (; *lpsz != 0; lpsz++) {
       if (*lpsz == '#') {
         nMaxLen += 2;
       } else if (*lpsz == '*') {
         nWidth = va_arg(argList, int);
-      } else if (*lpsz == '-' || *lpsz == '+' || *lpsz == '0' || *lpsz == ' ')
-        ;
-      else {
+      } else if (*lpsz != '-' && *lpsz != '+' && *lpsz != '0' && *lpsz != ' ') {
         break;
       }
     }
     if (nWidth == 0) {
       nWidth = FXSYS_wtoi(lpsz);
       while (std::iswdigit(*lpsz))
         ++lpsz;
     }
     if (nWidth < 0 || nWidth > 128 * 1024) {
       lpszFormat = L"Bad width";
@@ skipping 278 matching lines @@
       return (CFX_CharMap*)&g_DefaultJISMapper;
     case 936:
       return (CFX_CharMap*)&g_DefaultGBKMapper;
     case 949:
       return (CFX_CharMap*)&g_DefaultUHCMapper;
     case 950:
       return (CFX_CharMap*)&g_DefaultBig5Mapper;
   }
   return NULL;
 }