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

diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp
index 01ca91cc7532bda2b80834ae545e715aca00fae0..57cdad68028dae05b5fa891335234209a74217bc 100644 (file)
--- 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)
     // -------------------------------------------------------------
 
     // 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
     // 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 &&
                         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 "
                             foundDiff = true;
 
                             wxLogError("Parameter #%d of '%s::%s' should be "


@@ -1890,7 +1892,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
                             continue;
                         }
 
                             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'.",
                             wxLogWarning("Default value of parameter '%s' of "
                                          "'%s::%s' should be '%s' and not "
                                          "'%s'.",


@@ -2190,6 +2192,9 @@ static const wxString GetVersionString()
 
 /*
    $Log$
 
 /*
    $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)
 
    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 71b11773e7b156eea7e14c6ace087f03722cebe3..e567c6e58a8923579d5a9ece04111a4180e16a9f 100644 (file)
--- a/utils/HelpGen/src/wxstlac.h
+++ b/utils/HelpGen/src/wxstlac.h
@@ -83,7 +83,9 @@ protected:\
                value_type  mData;\
        };\
 \
                value_type  mData;\
        };\
 \

+public:\

        typedef tree_node* node_ref_type;\
        typedef tree_node* node_ref_type;\

+protected:\

 \
        node_ref_type   mpRoot;\
        node_ref_type   mpLeftMost;\
 \
        node_ref_type   mpRoot;\
        node_ref_type   mpLeftMost;\