diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 13:36:00 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 13:36:00 -0700 |
| commit | f1e7c461dfabbff6b65a072f24f6711b34159361 (patch) | |
| tree | 3b0bb772a59669f06b86824a444fd06642592d4b /core/include/fxcrt/fx_string.h | |
| parent | 320b2313d19869333ed453af546e61a9fc2b81c9 (diff) | |
| download | pdfium-f1e7c461dfabbff6b65a072f24f6711b34159361.tar.xz | |
Revert "FX_BOOL considered harmful, part 2."
This reverts commit 320b2313d19869333ed453af546e61a9fc2b81c9.
Reason for revert: build failure.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1255693002 .
Diffstat (limited to 'core/include/fxcrt/fx_string.h')
| -rw-r--r-- | core/include/fxcrt/fx_string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index 736aa32239..8d73555814 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -670,7 +670,7 @@ public: void Empty(); - bool IsEmpty() const + FX_BOOL IsEmpty() const { return !GetLength(); } @@ -895,7 +895,7 @@ inline bool operator!= (const CFX_WideStringC& lhs, const CFX_WideString& rhs) { return rhs != lhs; } FX_FLOAT FX_atof(const CFX_ByteStringC& str); -void FX_atonum(const CFX_ByteStringC& str, bool& bInteger, void* pData); +void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData); FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf); CFX_ByteString FX_UTF8Encode(const FX_WCHAR* pwsStr, FX_STRSIZE len); inline CFX_ByteString FX_UTF8Encode(const CFX_WideStringC& wsStr) |