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

misleading wxASSERT() corrected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-06-24 14:37:28 +00:00
parent 20193f1dab
commit f1da2f03fc
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

@@ -153,7 +153,7 @@ wxString::wxString(char ch, size_t nLength)
if ( nLength > 0 ) { if ( nLength > 0 ) {
AllocBuffer(nLength); AllocBuffer(nLength);
wxASSERT( sizeof(char) == 1 ); // can't use memset if not wxASSERT( sizeof(char) == 1 ); // can't use memset if not
memset(m_pchData, ch, nLength); memset(m_pchData, ch, nLength);
@@ -282,14 +282,14 @@ void wxString::AllocBeforeWrite(size_t nLen)
wxASSERT( nLen != 0 ); // doesn't make any sense wxASSERT( nLen != 0 ); // doesn't make any sense
// must not share string and must have enough space // must not share string and must have enough space
register wxStringData* pData = GetStringData(); register wxStringData* pData = GetStringData();
if ( pData->IsShared() || (nLen > pData->nAllocLength) ) { if ( pData->IsShared() || (nLen > pData->nAllocLength) ) {
// can't work with old buffer, get new one // can't work with old buffer, get new one
pData->Unlock(); pData->Unlock();
AllocBuffer(nLen); AllocBuffer(nLen);
} }
wxASSERT( !pData->IsShared() ); // we must be the only owner wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner
} }
// get the pointer to writable buffer of (at least) nLen bytes // get the pointer to writable buffer of (at least) nLen bytes