diff options
Diffstat (limited to 'core/fxcrt')
| -rw-r--r-- | core/fxcrt/fx_basic_buffer.cpp | 2 | ||||
| -rw-r--r-- | core/fxcrt/include/fx_string.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/core/fxcrt/fx_basic_buffer.cpp b/core/fxcrt/fx_basic_buffer.cpp index 7f85c95d3f..1e5d0554d1 100644 --- a/core/fxcrt/fx_basic_buffer.cpp +++ b/core/fxcrt/fx_basic_buffer.cpp @@ -290,7 +290,7 @@ CFX_ArchiveLoader& CFX_ArchiveLoader::operator>>(CFX_ByteString& str) { } int len; operator>>(len); - str.Empty(); + str.clear(); if (len <= 0 || m_LoadingPos + len > m_LoadingSize) { return *this; } diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/include/fx_string.h index 9d7d66741b..7024691e35 100644 --- a/core/fxcrt/include/fx_string.h +++ b/core/fxcrt/include/fx_string.h @@ -159,8 +159,6 @@ class CFX_ByteString { ~CFX_ByteString(); - // Deprecated -- use clear(). - void Empty() { m_pData.Reset(); } void clear() { m_pData.Reset(); } static CFX_ByteString FromUnicode(const FX_WCHAR* ptr, FX_STRSIZE len = -1); @@ -503,8 +501,6 @@ class CFX_WideString { return CFX_WideStringC(c_str(), GetLength()); } - // Deprecated -- use clear(). - void Empty() { m_pData.Reset(); } void clear() { m_pData.Reset(); } FX_STRSIZE GetLength() const { return m_pData ? m_pData->m_nDataLength : 0; } |