From 375a86403b7fa8d17d7b142c270e2d8e33bb924f Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 11 Jan 2016 11:59:17 -0800 Subject: 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 . --- core/include/fxcrt/fx_basic.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/include/fxcrt/fx_basic.h') diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 4aa823e06d..4e7c8c84b4 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -7,6 +7,8 @@ #ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_ #define CORE_INCLUDE_FXCRT_FX_BASIC_H_ +#include + #include "fx_memory.h" #include "fx_stream.h" #include "fx_string.h" @@ -1096,7 +1098,7 @@ class CFX_SortListArray { return; } while (nCount > 0) { - int32_t temp_count = FX_MIN(nCount, FX_DATALIST_LENGTH); + int32_t temp_count = std::min(nCount, FX_DATALIST_LENGTH); DataList list; list.data = FX_Alloc2D(uint8_t, temp_count, unit); list.start = nStart; -- cgit v1.2.3