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

Workarounds to allow compilation by Sun C++ 5.5

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-04-07 19:54:58 +00:00
parent 42389ac7c3
commit 3f37899571
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/HelpGen/src/HelpGen.cpp
View File

@@ -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 // info about a type: for now stored as text string, but must be parsed
// further later (to know that "char *" == "char []" - TODO) // further later (to know that "char *" == "char []" - TODO)
class TypeInfo class TypeInfo
@@ -1862,7 +1864,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
spParameter *ctxParam = (spParameter *)ctx; spParameter *ctxParam = (spParameter *)ctx;
const ParamInfo& param = method.GetParam(nParam); const ParamInfo& param = method.GetParam(nParam);
if ( m_checkParamNames && if ( m_checkParamNames &&
(param.GetName() != ctxParam->mName) ) { (param.GetName() != ctxParam->mName.c_str()) ) {
foundDiff = true; foundDiff = true;
wxLogError("Parameter #%d of '%s::%s' should be " 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 " wxLogWarning("Default value of parameter '%s' of "
"'%s::%s' should be '%s' and not " "'%s::%s' should be '%s' and not "
"'%s'.", "'%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 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) give an error message if we're built in Unicode mode (in response to bug 1079224)

2
utils/HelpGen/src/wxstlac.h
View File

@@ -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 mpRoot;\
node_ref_type mpLeftMost;\ node_ref_type mpLeftMost;\