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 . --- xfa/src/fxbarcode/common/BC_CommonByteArray.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xfa/src/fxbarcode/common') diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp index 967a1849d5..c36ff34a6d 100644 --- a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp @@ -20,6 +20,8 @@ * limitations under the License. */ +#include + #include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonByteArray.h" CBC_CommonByteArray::CBC_CommonByteArray() { @@ -61,7 +63,7 @@ FX_BOOL CBC_CommonByteArray::IsEmpty() { } void CBC_CommonByteArray::AppendByte(int32_t value) { if (m_size == 0 || m_index >= m_size) { - int32_t newSize = FX_MAX(32, m_size << 1); + int32_t newSize = std::max(32, m_size << 1); Reserve(newSize); } m_bytes[m_index] = (uint8_t)value; -- cgit v1.2.3