Merge to XFA: Switch most min/max macros to std::min/max.
Fix lint errors along the way.
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1567343002 .
(cherry picked from commit 9adfbb0920a258e916003b1ee9515e97879db82a)
Review URL: https://codereview.chromium.org/1577503002 .
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index 6db31de..d2f7fb0 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -6,6 +6,8 @@
#include "PublicMethods.h"
+#include <algorithm>
+
#include "Field.h"
#include "JS_Context.h"
#include "JS_Define.h"
@@ -142,10 +144,10 @@
return dValue1 * dValue2;
}
if (FXSYS_wcsicmp(sFuction, L"MIN") == 0) {
- return FX_MIN(dValue1, dValue2);
+ return std::min(dValue1, dValue2);
}
if (FXSYS_wcsicmp(sFuction, L"MAX") == 0) {
- return FX_MAX(dValue1, dValue2);
+ return std::max(dValue1, dValue2);
}
return dValue1;
}