From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- core/include/fxcrt/fx_string.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/include/fxcrt/fx_string.h') diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index ad1d083323..df7dd0c762 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -21,7 +21,7 @@ class CFX_WideStringL; // An immutable string with caller-provided storage which must outlive the // string itself. -class CFX_ByteStringC : public CFX_Object +class CFX_ByteStringC { public: typedef FX_CHAR value_type; @@ -171,7 +171,7 @@ struct CFX_StringData { FX_CHAR m_String[1]; }; -class CFX_ByteString : public CFX_Object +class CFX_ByteString { public: typedef FX_CHAR value_type; @@ -428,7 +428,7 @@ inline CFX_ByteString operator + (FX_BSTR str1, const CFX_ByteString& str2) { return CFX_ByteString(str1, str2); } -class CFX_StringBufBase : public CFX_Object +class CFX_StringBufBase { public: @@ -484,7 +484,7 @@ public: FX_CHAR m_Buffer[limit]; }; typedef CFX_StringBufTemplate<256> CFX_StringBuf256; -class CFX_WideStringC : public CFX_Object +class CFX_WideStringC { public: typedef FX_WCHAR value_type; @@ -630,7 +630,7 @@ struct CFX_StringDataW { FX_WCHAR m_String[1]; }; -class CFX_WideString : public CFX_Object +class CFX_WideString { public: typedef FX_WCHAR value_type; -- cgit v1.2.3