diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-01-07 12:28:56 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-01-07 12:28:56 -0800 |
| commit | a5c9431631c7305224c846e71b9c8f811c610f60 (patch) | |
| tree | 5939c1cba8468eaa03e397efe1e6ac2f3763198e /core | |
| parent | 22ee248278586790e9e748cbc2a01dacd39e6cf1 (diff) | |
| download | pdfium-a5c9431631c7305224c846e71b9c8f811c610f60.tar.xz | |
Merge to XFA: Add ostream helpers for FX String classes.
Original CL at https://codereview.chromium.org/837843002
TBR=brucedawson@chromium.org
Review URL: https://codereview.chromium.org/809313008
Diffstat (limited to 'core')
| -rw-r--r-- | core/include/fxcrt/fx_string.h | 4 | ||||
| -rw-r--r-- | core/src/fxcrt/fx_basic_bstring_unittest.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index 91032f9d97..524d7efde5 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -18,6 +18,7 @@ class CFX_WideStringL; class CFX_ByteStringC : public CFX_Object { public: + typedef FX_CHAR value_type; CFX_ByteStringC() { @@ -160,6 +161,7 @@ struct CFX_StringData { class CFX_ByteString : public CFX_Object { public: + typedef FX_CHAR value_type; CFX_ByteString() { @@ -473,6 +475,7 @@ typedef CFX_StringBufTemplate<256> CFX_StringBuf256; class CFX_WideStringC : public CFX_Object { public: + typedef FX_WCHAR value_type; CFX_WideStringC() { @@ -618,6 +621,7 @@ struct CFX_StringDataW { class CFX_WideString : public CFX_Object { public: + typedef FX_WCHAR value_type; CFX_WideString() { diff --git a/core/src/fxcrt/fx_basic_bstring_unittest.cpp b/core/src/fxcrt/fx_basic_bstring_unittest.cpp index cf5e05d1ef..138f1bff2c 100644 --- a/core/src/fxcrt/fx_basic_bstring_unittest.cpp +++ b/core/src/fxcrt/fx_basic_bstring_unittest.cpp @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" - +#include "testing/fx_string_testhelpers.h" #include "../../include/fxcrt/fx_basic.h" TEST(fxcrt, ByteStringCNull) { |