From f5a1d01f30cfa26aac12f63fce2d074628039240 Mon Sep 17 00:00:00 2001 From: smh Date: Thu, 9 Jun 2005 05:22:50 +0000 Subject: [PATCH] Compiler errors on gcc 3.4.1 corrected: - missing declaration of a function added - typedef'ed pointer-to-method didn't accept default arguments, so passing all function arguments explicitly --- src/VISU_I/VISU_DumpPython.cc | 11 +++++++++++ src/VISU_I/VISU_View_i.cc | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc index 1474d24e..343f15ef 100644 --- a/src/VISU_I/VISU_DumpPython.cc +++ b/src/VISU_I/VISU_DumpPython.cc @@ -229,6 +229,17 @@ namespace VISU{ return thePrefix; } + //=========================================================================== + // declaration + void DumpChildrenToPython(SALOMEDS::Study_ptr theStudy, + CORBA::Boolean theIsPublished, + CORBA::Boolean& theIsValidScript, + SALOMEDS::SObject_ptr theSObject, + std::ostream& theStr, + TName2EntryMap& theName2EntryMap, + TEntry2NameMap& theEntry2NameMap, + std::string theArgumentName, + std::string thePrefix); //=========================================================================== template diff --git a/src/VISU_I/VISU_View_i.cc b/src/VISU_I/VISU_View_i.cc index 18254b0f..4f0ce8a5 100644 --- a/src/VISU_I/VISU_View_i.cc +++ b/src/VISU_I/VISU_View_i.cc @@ -681,7 +681,7 @@ namespace VISU{ class TEnableGridEvent: public SALOME_Event { public: - typedef void (Plot2d_ViewFrame::* TFun)(bool, const int, bool, const int, bool = true); + typedef void (Plot2d_ViewFrame::* TFun)(bool, const int, bool, const int, bool); TEnableGridEvent (Plot2d_ViewFrame* theView, TFun theFun, CORBA::Boolean theMajor, CORBA::Long theNumMajor, CORBA::Boolean theMinor, CORBA::Long theNumMinor): @@ -692,7 +692,7 @@ namespace VISU{ virtual void Execute() { - (myView->*myFun)(myMajor,myNumMajor,myMinor,myNumMinor); + (myView->*myFun)(myMajor,myNumMajor,myMinor,myNumMinor,true); } protected: Plot2d_ViewFrame* myView; @@ -717,14 +717,14 @@ namespace VISU{ class TSetScaleModeEvent: public SALOME_Event { public: - typedef void (Plot2d_ViewFrame::* TFun)(const int, bool = true); + typedef void (Plot2d_ViewFrame::* TFun)(const int, bool); TSetScaleModeEvent (Plot2d_ViewFrame* theView, TFun theFun, int theScaling): myView(theView), myFun(theFun), myScaling(theScaling) {} virtual void Execute() { - (myView->*myFun)(myScaling); + (myView->*myFun)(myScaling,true); } protected: Plot2d_ViewFrame* myView; -- 2.39.2