Workarounds to allow compilation by Sun C++ 5.5

[wxWidgets.git] / utils / HelpGen / src / cjparser.cpp

diff --git a/utils/HelpGen/src/cjparser.cpp b/utils/HelpGen/src/cjparser.cpp
index 9cbf7f2dfd6ab132f2bd8a92e85f096cde3d3851..3c706cbcf8c79ab0ab7602fcbe8991f5a59004b3 100644 (file)
--- a/utils/HelpGen/src/cjparser.cpp
+++ b/utils/HelpGen/src/cjparser.cpp
@@ -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 );
     }