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

xfa/src/fgas/src/localization/fx_locale.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_xml.h"
 #include "xfa/src/fgas/src/fgas_base.h"
 #include "fx_localeimp.h"
 
 #define FX_LOCALECATEGORY_DateHash 0xbde9abde
 #define FX_LOCALECATEGORY_TimeHash 0x2d71b00f
 #define FX_LOCALECATEGORY_DateTimeHash 0x158c72ed
 #define FX_LOCALECATEGORY_NumHash 0x0b4ff870
 #define FX_LOCALECATEGORY_TextHash 0x2d08af85
 #define FX_LOCALECATEGORY_ZeroHash 0x568cb500
@@ skipping 4555 matching lines @@
   if (!retVal) {
     retVal += (lo1 > lo2 ? 1 : (lo1 < lo2 ? -1 : 0));
   }
   return retVal;
 }
 static inline int8_t fxmath_decimal_helper_raw_compare_any(uint64_t a[],
                                                            uint8_t al,
                                                            uint64_t b[],
                                                            uint8_t bl) {
   int8_t retVal = 0;
-  for (int i = FX_MAX(al - 1, bl - 1); i >= 0; i--) {
+  for (int i = std::max(al - 1, bl - 1); i >= 0; i--) {
     uint64_t l = (i >= al ? 0 : a[i]), r = (i >= bl ? 0 : b[i]);
     retVal += (l > r ? 1 : (l < r ? -1 : 0));
     if (retVal) {
       return retVal;
     }
   }
   return retVal;
 }
 static inline void fxmath_decimal_helper_dec_any(uint64_t a[], uint8_t al) {
   for (int i = 0; i < al; i++) {
@@ skipping 80 matching lines @@
         left[0]++;
         fxmath_decimal_helper_normalize_any(left, al);
         break;
       case 1:
         for (i = 0; i < 16; i++) {
           right[i] = cur[i];
         }
         fxmath_decimal_helper_dec_any(right, al);
         break;
       case 0:
-        for (i = 0; i < FX_MIN(al, cl); i++) {
+        for (i = 0; i < std::min(al, cl); i++) {
           c[i] = cur[i];
         }
         return;
     }
   }
-  for (i = 0; i < FX_MIN(al, cl); i++) {
+  for (i = 0; i < std::min(al, cl); i++) {
     c[i] = left[i];
   }
 }
 static inline FX_BOOL fxmath_decimal_helper_outofrange(uint64_t a[],
                                                        uint8_t al,
                                                        uint8_t goal) {
   for (int i = goal; i < al; i++) {
     if (a[i]) {
       return TRUE;
     }
@@ skipping 249 matching lines @@
   val.m_uLo = tmp;
   tmp = m_uFlags;
   m_uFlags = val.m_uFlags;
   val.m_uFlags = tmp;
 }
 int8_t CFX_Decimal::Compare(const CFX_Decimal& val) const {
   CFX_Decimal lhs = *this, rhs = val;
   int8_t retVal = 0;
   if (FXMATH_DECIMAL_FLAGS2SCALE(lhs.m_uFlags) !=
       FXMATH_DECIMAL_FLAGS2SCALE(rhs.m_uFlags)) {
-    uint8_t scale = FX_MIN(FXMATH_DECIMAL_FLAGS2SCALE(lhs.m_uFlags),
-                           FXMATH_DECIMAL_FLAGS2SCALE(rhs.m_uFlags));
+    uint8_t scale = std::min(FXMATH_DECIMAL_FLAGS2SCALE(lhs.m_uFlags),
+                             FXMATH_DECIMAL_FLAGS2SCALE(rhs.m_uFlags));
     lhs.SetScale(scale);
     rhs.SetScale(scale);
   }
   retVal = -(FXMATH_DECIMAL_FLAGS2NEG(lhs.m_uFlags) -
              FXMATH_DECIMAL_FLAGS2NEG(rhs.m_uFlags));
   if (retVal) {
     return retVal;
   }
   retVal = fxmath_decimal_helper_raw_compare(lhs.m_uHi, lhs.m_uMid, lhs.m_uLo,
                                              rhs.m_uHi, rhs.m_uMid, rhs.m_uLo);
   return (FXMATH_DECIMAL_FLAGS2NEG(lhs.m_uFlags) ? -retVal : retVal);
 }
 CFX_Decimal CFX_Decimal::AddOrMinus(const CFX_Decimal& val,
                                     FX_BOOL isAdding) const {
   CFX_Decimal lhs = *this, rhs = val;
   if (FXMATH_DECIMAL_FLAGS2SCALE(lhs.m_uFlags) !=
       FXMATH_DECIMAL_FLAGS2SCALE(rhs.m_uFlags)) {
-    uint8_t scale = FX_MAX(FXMATH_DECIMAL_FLAGS2SCALE(lhs.m_uFlags),
-                           FXMATH_DECIMAL_FLAGS2SCALE(rhs.m_uFlags));
+    uint8_t scale = std::max(FXMATH_DECIMAL_FLAGS2SCALE(lhs.m_uFlags),
+                             FXMATH_DECIMAL_FLAGS2SCALE(rhs.m_uFlags));
     lhs.SetScale(scale);
     rhs.SetScale(scale);
   }
   if (!isAdding) {
     rhs.SetNegate();
   }
   FX_BOOL doRawAdd = (FXMATH_DECIMAL_FLAGS2NEG(lhs.m_uFlags) ==
                       FXMATH_DECIMAL_FLAGS2NEG(rhs.m_uFlags));
   if (doRawAdd) {
     uint64_t phi = lhs.m_uHi, pmid = lhs.m_uMid, plo = lhs.m_uLo;
@@ skipping 126 matching lines @@
 }
 CFX_Decimal CFX_Decimal::operator*(const CFX_Decimal& val) const {
   return Multiply(val);
 }
 CFX_Decimal CFX_Decimal::operator/(const CFX_Decimal& val) const {
   return Divide(val);
 }
 CFX_Decimal CFX_Decimal::operator%(const CFX_Decimal& val) const {
   return Modulus(val);
 }