Index: core/src/fxcrt/fx_basic_wstring.cpp |
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp |
index dd26f595f2b320024f36d05d872456c1ce9d01e7..2370c87cf18a450d419df7be4ce148bb964d1205 100644 |
--- a/core/src/fxcrt/fx_basic_wstring.cpp |
+++ b/core/src/fxcrt/fx_basic_wstring.cpp |
@@ -5,6 +5,8 @@ |
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com |
#include <stddef.h> // For offsetof(). |
+ |
+#include <algorithm> |
#include <cctype> |
#include "core/include/fxcrt/fx_basic.h" |
@@ -639,7 +641,7 @@ FX_STRSIZE CFX_WideString::Replace(const FX_WCHAR* lpszOld, |
pOldData->Release(); |
} |
lpszStart = m_pData->m_String; |
- lpszEnd = m_pData->m_String + FX_MAX(m_pData->m_nDataLength, nNewLength); |
+ lpszEnd = m_pData->m_String + std::max(m_pData->m_nDataLength, nNewLength); |
{ |
while ((lpszTarget = (FX_WCHAR*)FXSYS_wcsstr(lpszStart, lpszOld)) != |
NULL && |
@@ -758,9 +760,7 @@ void CFX_WideString::FormatV(const FX_WCHAR* lpszFormat, va_list argList) { |
nMaxLen += 2; |
} else if (*lpsz == '*') { |
nWidth = va_arg(argList, int); |
- } else if (*lpsz == '-' || *lpsz == '+' || *lpsz == '0' || *lpsz == ' ') |
- ; |
- else { |
+ } else if (*lpsz != '-' && *lpsz != '+' && *lpsz != '0' && *lpsz != ' ') { |
break; |
} |
} |