diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-20 12:03:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-20 12:03:54 -0700 |
| commit | eca0f82e5c7bc7b7d34eaa32c452147ee2b7bbdb (patch) | |
| tree | c48059440011de127446c21f698c1088c86c570e | |
| parent | 6b2c4d7d709dbfca0a59ce6310c0941669d0f53e (diff) | |
| download | pdfium-eca0f82e5c7bc7b7d34eaa32c452147ee2b7bbdb.tar.xz | |
Inline CFX_WideString::c_str.
This was causing issues at one point with the GN build but seems to have been
resolved in the meantime.
Review URL: https://codereview.chromium.org/1907563002
| -rw-r--r-- | core/fxcrt/fx_basic_wstring.cpp | 4 | ||||
| -rw-r--r-- | core/fxcrt/include/fx_string.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp index 1e8f1f3232..069b9fa42d 100644 --- a/core/fxcrt/fx_basic_wstring.cpp +++ b/core/fxcrt/fx_basic_wstring.cpp @@ -579,10 +579,6 @@ void CFX_WideString::FormatV(const FX_WCHAR* pFormat, va_list argList) { va_end(argListSave); } -const FX_WCHAR* CFX_WideString::c_str() const { - return m_pData ? m_pData->m_String : L""; -} - void CFX_WideString::Format(const FX_WCHAR* pFormat, ...) { va_list argList; va_start(argList, pFormat); diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/include/fx_string.h index 8041522472..10a70d9334 100644 --- a/core/fxcrt/include/fx_string.h +++ b/core/fxcrt/include/fx_string.h @@ -496,7 +496,7 @@ class CFX_WideString { // Explicit conversion to C-style wide string. // Note: Any subsequent modification of |this| will invalidate the result. - const FX_WCHAR* c_str() const; + const FX_WCHAR* c_str() const { return m_pData ? m_pData->m_String : L""; } // Explicit conversion to CFX_WideStringC. // Note: Any subsequent modification of |this| will invalidate the result. |