diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-11 11:59:17 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-11 11:59:17 -0800 |
| commit | 375a86403b7fa8d17d7b142c270e2d8e33bb924f (patch) | |
| tree | 1db1ffddb2bbbcd429cd1d7954b1949bfa54e1ab /core/include | |
| parent | 492961df3011ccc25646eae12ac6e6dcfe7f26da (diff) | |
| download | pdfium-375a86403b7fa8d17d7b142c270e2d8e33bb924f.tar.xz | |
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 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fxcrt/fx_basic.h | 4 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_system.h | 1 |
2 files changed, 3 insertions, 2 deletions
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 <algorithm> + #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; diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index e0412a0349..2fbab98a1d 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -110,7 +110,6 @@ static_assert(FALSE == false, "false_needs_to_be_false"); #endif #endif -#define FX_MAX(a, b) (((a) > (b)) ? (a) : (b)) #define FX_MIN(a, b) (((a) < (b)) ? (a) : (b)) #define FX_PI 3.1415926535897932384626433832795f |