From c616483e834b791b92b0c0d4f99d0ea3b66f1a4f Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Tue, 30 Dec 2014 16:56:12 -0800 Subject: XFA: merge patch from CL 733693003, get rid of FX_LPCSTR cast Get rid of FX_LPCSTR cast. Follow up on https://codereview.chromium.org/733693003 R=brucedawson@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/809993004 --- core/include/fxcrt/fx_string.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'core/include/fxcrt') diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index 47e8ecdf1e..d6701e3d44 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -184,6 +184,13 @@ public: static CFX_ByteString FromUnicode(const CFX_WideString& str); + // Explicit conversion to raw string + FX_LPCSTR c_str() const + { + return m_pData ? m_pData->m_String : ""; + } + + // Implicit conversion to C-style string -- deprecated operator FX_LPCSTR() const { return m_pData ? m_pData->m_String : ""; -- cgit v1.2.3