Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ 1123256 ] wxString operator+ pre-allocates buffer then throws it away ---- and ---- [ 1123195 ] Avoid double-copy in two wxStringBase functions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-02-15 19:12:36 +00:00
parent b46a190c27
commit c08d805c5a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/string.cpp
View File

@@ -326,7 +326,7 @@ wxStringBase& wxStringBase::append(size_t n, wxChar ch)
{ {
size_type len = length(); size_type len = length();
if ( !CopyBeforeWrite() || !Alloc(len + n) ) { if ( !Alloc(len + n) || !CopyBeforeWrite() ) {
wxFAIL_MSG( _T("out of memory in wxStringBase::append") ); wxFAIL_MSG( _T("out of memory in wxStringBase::append") );
} }
GetStringData()->nDataLength = len + n; GetStringData()->nDataLength = len + n;
@@ -445,7 +445,7 @@ wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n)
if ( n == npos ) n = wxStrlen(sz); if ( n == npos ) n = wxStrlen(sz);
if ( n == 0 ) return *this; if ( n == 0 ) return *this;
if ( !CopyBeforeWrite() || !Alloc(length() + n) ) { if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {
wxFAIL_MSG( _T("out of memory in wxStringBase::insert") ); wxFAIL_MSG( _T("out of memory in wxStringBase::insert") );
} }
@@ -1225,7 +1225,7 @@ wxString operator+(const wxString& str, const wxChar *psz)
if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) { if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) {
wxFAIL_MSG( _T("out of memory in wxString::operator+") ); wxFAIL_MSG( _T("out of memory in wxString::operator+") );
} }
s = str; s += str;
s += psz; s += psz;
return s; return s;