Update for gcc4.1.1

diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.hxx b/src/GraphEditor/DataFlowEditor_DataFlow.hxx
index c267e77149ba73ee6441f539bd0514b581e2b1d1..f539783620189e0b76caa4409f76e31ead00549a 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_DataFlow.hxx
+++ b/src/GraphEditor/DataFlowEditor_DataFlow.hxx
@@ -233,7 +233,7 @@ namespace GraphEditor {
       long SubStreamGraphsNumber() ;
 
       void Executor(GraphExecutor::DataFlow * DataFlowExecutor ) ;
-      GraphExecutor::DataFlow * GraphEditor::DataFlow::Executor() const ;
+      GraphExecutor::DataFlow * Executor() const ;
 
   };
 

diff --git a/src/GraphEditor/DataFlowEditor_OutNode.hxx b/src/GraphEditor/DataFlowEditor_OutNode.hxx
index 156d6a3a261a9841ffae7f37e08766b9dcc86c8f..3dcc430340e45c873cbdf442a3040ff44bb25796 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_OutNode.hxx
+++ b/src/GraphEditor/DataFlowEditor_OutNode.hxx
@@ -62,14 +62,14 @@ namespace GraphEditor {
                       const GraphBase::ListOfSLinks &aDatas ) ;
 
 //      bool GraphEditor::OutNode::LinkSaveXML( ostream &f , char *Tabs ,
-      bool GraphEditor::OutNode::LinkSaveXML( QDomDocument & Graph , QDomElement & link ,
+      bool LinkSaveXML( QDomDocument & Graph , QDomElement & link ,
                                               GraphBase::SLink aLink ,
                                               bool wdata ) const ;
 //      bool SaveXML(ostream &f ) ;QDomDocument & Graph 
       bool SaveXML( ostream & f , QDomDocument & Graph ,
                     bool aSuperGraph , QDomElement & supergraph ) ;
 
-      bool GraphEditor::OutNode::LinkSavePY( ostream &f ,
+      bool LinkSavePY( ostream &f ,
                                              const char *aGraphName ,
                                              GraphBase::SLink aLink ,
                                              bool fromparam ,

diff --git a/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx b/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx
index cec877a23b70c1640358a4fc8be041d620f9968d..b56f5e5d25268a7405272338447334e02c172a30 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx
+++ b/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx
@@ -620,8 +620,8 @@ int GraphExecutor::InNode::executeAction() {
         char * msg = "Cannot pthread_create " ;
         perror( msg ) ;
         cdebug << ThreadNo() << " " << msg << " --> sleep(5)" << endl ;
-        cdebug << ThreadNo() << " PTHREAD_THREADS_MAX : "
-               << PTHREAD_THREADS_MAX << " pthread_create status : " ;
+       //        cdebug << ThreadNo() << " PTHREAD_THREADS_MAX : "
+        //       << PTHREAD_THREADS_MAX << " pthread_create status : " ;
         if ( pthread_sts == EAGAIN ) {
           cdebug << "EAGAIN(" << pthread_sts << ")" << endl ;
           cdebug << _OutNode->CreatedThreads() << " was created (and exited)" << endl ;

diff --git a/src/Supervision/Graph_Impl.hxx b/src/Supervision/Graph_Impl.hxx
index cf49d196e9df60305427bf40ce5d03149fa905e6..699fee05fb21f7e5b84c0157d640eedbc4973c4b 100644 (file)
--- a/src/Supervision/Graph_Impl.hxx
+++ b/src/Supervision/Graph_Impl.hxx
@@ -158,7 +158,7 @@ class Graph_Impl : public POA_SUPERV::Graph ,
     virtual SUPERV::Link_ptr Link( SUPERV::Port_ptr OutPort ,
                                    SUPERV::Port_ptr InPort ) ;
 
-    virtual SUPERV::ListOfNodes_var Graph_Impl::SetNode( SUPERV::ListOfNodes_var RetVal ,
+    virtual SUPERV::ListOfNodes_var SetNode( SUPERV::ListOfNodes_var RetVal ,
                                                          GraphBase::ComputingNode * aNode ) ;
     virtual SUPERV::ListOfNodes * Nodes() ;
     virtual void SetNodeObjRef( GraphEditor::InNode * anInNode ) ;