From f7a7d7e07396c3a0fae617ed8f15f29fd491bc3a Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Apr 2015 11:31:26 -0700 Subject: Revert "Kill operator LPCWSTR from CFX_WideString()." This reverts commit 15a62973b9b89c3e229cc0ab501c45967f91b325. Reason for revert: broke build on windows, mac. I must have missed some platform-specific conversions. TBR=brucedawson@chromium.org Review URL: https://codereview.chromium.org/1108883002 --- core/include/fxcrt/fx_string.h | 7 +++++++ 1 file changed, 7 insertions(+) (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 0dbba4ca85..1efb814b08 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -636,8 +636,15 @@ public: return m_pData ? m_pData->m_String : L""; } + // Implicit conversion to C-style wide string -- deprecated + operator FX_LPCWSTR() const + { + return m_pData ? m_pData->m_String : L""; + } + void Empty(); + FX_BOOL IsEmpty() const { return !GetLength(); -- cgit v1.2.3