From 001d89a7f8caf7e6702b972c1e3cced1cc17684e Mon Sep 17 00:00:00 2001 From: maintenance team Date: Tue, 26 Sep 2006 08:29:09 +0000 Subject: [PATCH] Update for gcc4.1.1 --- src/GraphEditor/DataFlowEditor_DataFlow.hxx | 2 +- src/GraphEditor/DataFlowEditor_OutNode.hxx | 4 ++-- src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx | 4 ++-- src/Supervision/Graph_Impl.hxx | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.hxx b/src/GraphEditor/DataFlowEditor_DataFlow.hxx index c267e77..f539783 100644 --- 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 156d6a3..3dcc430 100644 --- 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 cec877a..b56f5e5 100644 --- 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 cf49d19..699fee0 100644 --- 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 ) ; -- 2.39.2