summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-06 12:59:20 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-06 12:59:20 -0700
commit3cc55de355d2eea165cf5981f1b0f83a118ae9c4 (patch)
tree9298aeed337ec0c1cecb79881a1430d4c22886dd /core
parent997bc0e2b4fd3f43b17b9bfcec8a9cac2283cb1d (diff)
downloadpdfium-3cc55de355d2eea165cf5981f1b0f83a118ae9c4.tar.xz
Merge to XFA: Fix fx_string.h compile error under chromium checkouts.
Original Review URL: https://codereview.chromium.org/1127043004 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1131553005
Diffstat (limited to 'core')
-rw-r--r--core/include/fxcrt/fx_string.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index 023f7658c3..fe0985772d 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -91,7 +91,7 @@ public:
CFX_ByteStringC& operator = (const CFX_ByteString& src);
bool operator== (const char* ptr) const {
- return strlen(ptr) == m_Length &&
+ return (FX_STRSIZE)FXSYS_strlen(ptr) == m_Length &&
FXSYS_memcmp32(ptr, m_Ptr, m_Length) == 0;
}
bool operator== (const CFX_ByteStringC& other) const {
@@ -510,7 +510,7 @@ public:
CFX_WideStringC& operator = (const CFX_WideString& src);
bool operator== (const wchar_t* ptr) const {
- return FXSYS_wcslen(ptr) == m_Length &&
+ return (FX_STRSIZE)FXSYS_wcslen(ptr) == m_Length &&
wmemcmp(ptr, m_Ptr, m_Length) == 0;
}
bool operator== (const CFX_WideStringC& str) const {