summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-06 12:40:23 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-06 12:40:23 -0700
commitad2a822ce5c320c61510ffdc309f766ab1056ef5 (patch)
treee4e5e2faff9aedf1aa4989c74e1d5f3ba834fe56
parent6ab919ff310fb02bab8cf43d92a5553b11cbbb61 (diff)
downloadpdfium-ad2a822ce5c320c61510ffdc309f766ab1056ef5.tar.xz
Fix fx_string.h compile error under chromium checkouts.chromium/2398chromium/2397chromium/2396
This gets included in chromium's pdfium_engine.cc, and thus must pass a higher error level. There's probably a follow-up to check why the FPDF_ api doesn't insulate chromium from this file. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1127043004
-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 {