From 3f37899571cf7231fbfc5656fb011917d23b99f5 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Thu, 7 Apr 2005 19:54:58 +0000 Subject: [PATCH] Workarounds to allow compilation by Sun C++ 5.5 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/HelpGen/src/HelpGen.cpp | 9 +++++++-- utils/HelpGen/src/wxstlac.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp index 01ca91cc75..57cdad6802 100644 --- a/utils/HelpGen/src/HelpGen.cpp +++ b/utils/HelpGen/src/HelpGen.cpp @@ -426,6 +426,8 @@ protected: // information about all functions documented in the TeX file(s) // ------------------------------------------------------------- +public: // Note: Sun C++ 5.5 requires TypeInfo and ParamInfo to be public + // info about a type: for now stored as text string, but must be parsed // further later (to know that "char *" == "char []" - TODO) class TypeInfo @@ -1862,7 +1864,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const spParameter *ctxParam = (spParameter *)ctx; const ParamInfo& param = method.GetParam(nParam); if ( m_checkParamNames && - (param.GetName() != ctxParam->mName) ) { + (param.GetName() != ctxParam->mName.c_str()) ) { foundDiff = true; wxLogError("Parameter #%d of '%s::%s' should be " @@ -1890,7 +1892,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const continue; } - if ( param.GetDefValue() != ctxParam->mInitVal ) { + if ( param.GetDefValue() != ctxParam->mInitVal.c_str() ) { wxLogWarning("Default value of parameter '%s' of " "'%s::%s' should be '%s' and not " "'%s'.", @@ -2190,6 +2192,9 @@ static const wxString GetVersionString() /* $Log$ + Revision 1.36 2005/04/07 19:54:58 MW + Workarounds to allow compilation by Sun C++ 5.5 + Revision 1.35 2004/12/12 11:03:31 VZ give an error message if we're built in Unicode mode (in response to bug 1079224) diff --git a/utils/HelpGen/src/wxstlac.h b/utils/HelpGen/src/wxstlac.h index 71b11773e7..e567c6e58a 100644 --- a/utils/HelpGen/src/wxstlac.h +++ b/utils/HelpGen/src/wxstlac.h @@ -83,7 +83,9 @@ protected:\ value_type mData;\ };\ \ +public:\ typedef tree_node* node_ref_type;\ +protected:\ \ node_ref_type mpRoot;\ node_ref_type mpLeftMost;\