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

Fixes to allow compilation with wxUSE_STD_STRING

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-04-07 19:52:05 +00:00
parent 7215f534ad
commit 42389ac7c3
7 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/HelpGen/src/cjparser.cpp
View File

@@ -1621,7 +1621,11 @@ bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
if ( cur >= start )
{
string rettype = string( start, size_t( cur-start ) );
rettype.Replace("WXDLLEXPORT ", ""); // FIXME just for now...
// FIXME just for now...
string::size_type pos = 0;
string toerase("WXDLLEXPORT ");
while((pos = rettype.find(toerase, pos)) != string::npos)
rettype.erase(pos, toerase.length());
pOp->mRetType = rettype;
}
@@ -1912,11 +1916,11 @@ void CJSourceParser::ParseMemberVar( char*& cur )
if ( !pAttr )
continue;
if ( !pAttr->mType )
if ( pAttr->mType.empty() )
pAttr->mType = type;
pAttr->mVisibility = mCurVis;
if ( !!pAttr->mName )
if ( !pAttr->mName.empty() )
arrange_indirection_tokens_between( pAttr->mType, pAttr->mName );
}