From: apo Date: Thu, 6 Apr 2006 10:48:46 +0000 (+0000) Subject: Porting on Mandriva 64 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_Mandriva_2006_64;p=modules%2Fsuperv.git Porting on Mandriva 64 --- diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index a52498c..c55ba15 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -254,17 +254,29 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base ACLOCAL_SRC = \ -ac_cxx_bool.m4 check_corba.m4 \ -ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ -ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ -ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ -ac_cxx_partial_specialization.m4 python.m4 \ -ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ -ac_cc_warnings.m4 check_swig.m4 + ac_cxx_bool.m4 \ + check_corba.m4 \ + ac_cxx_depend_flag.m4 \ + check_hdf5.m4 \ + enable_pthreads.m4 \ + ac_cxx_mutable.m4 \ + check_mico.m4 \ + ac_cxx_namespaces.m4 \ + check_omniorb.m4 \ + pyembed.m4 \ + ac_cxx_partial_specialization.m4 \ + python.m4 \ + ac_cxx_typename.m4 \ + check_pthreads.m4 check_cas.m4 \ + ac_cc_warnings.m4 \ + check_swig.m4 ACLOCAL_GUI = \ -check_vtk.m4 check_opengl.m4 check_qt.m4 \ -check_GUI.m4 check_corba_in_GUI.m4 + check_vtk.m4 \ + check_opengl.m4 \ + check_qt.m4 \ + check_GUI.m4 \ + check_corba_in_GUI.m4 $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) diff --git a/src/GraphBase/DataFlowBase_ComputingNode.cxx b/src/GraphBase/DataFlowBase_ComputingNode.cxx index d8c606e..cafe851 100644 --- a/src/GraphBase/DataFlowBase_ComputingNode.cxx +++ b/src/GraphBase/DataFlowBase_ComputingNode.cxx @@ -375,9 +375,9 @@ GraphBase::SNode * GraphBase::ComputingNode::GetInfo() { Info->theName = Name() ; Info->theKind = Kind() ; if ( IsDataStreamNode() ) { - long Timeout ; + CORBA::Long Timeout ; SUPERV::KindOfDataStreamTrace DataStreamTrace ; - double DeltaTime ; + CORBA::Double DeltaTime ; ((GraphBase::StreamGraph * ) this)->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; Info->theTimeout = Timeout ; Info->theDataStreamTrace = DataStreamTrace ; @@ -1167,9 +1167,9 @@ bool GraphBase::ComputingNode::SaveXML( QDomDocument & Graph , QDomElement & inf kind.appendChild( aField ) ; if ( IsDataStreamNode() && HasDataStream() != 0 ) { - long Timeout ; + CORBA::Long Timeout ; SUPERV::KindOfDataStreamTrace DataStreamTrace ; - double DeltaTime ; + CORBA::Double DeltaTime ; ((GraphBase::StreamGraph * ) this)->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; QDomElement timeout = Graph.createElement("streamgraph-timeout") ; @@ -1536,9 +1536,9 @@ bool GraphBase::ComputingNode::SavePY( ostream &f , const char * aGraphName , } else if ( IsDataStreamNode() && HasDataStream() != 0 ) { f << " " << Name() << " = StreamGraph( '" << Name() << "' )" << endl ; - long Timeout ; + CORBA::Long Timeout ; SUPERV::KindOfDataStreamTrace DataStreamTrace ; - double DeltaTime ; + CORBA::Double DeltaTime ; ((GraphBase::StreamGraph * ) this)->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; f << " " << aGraphName << ".SetStreamParams( " << Timeout << " , SUPERV." << DataStreamTrace << " , " << DeltaTime << " )" << endl ; diff --git a/src/GraphBase/DataFlowBase_Graph.cxx b/src/GraphBase/DataFlowBase_Graph.cxx index 7b63c99..e0963cf 100644 --- a/src/GraphBase/DataFlowBase_Graph.cxx +++ b/src/GraphBase/DataFlowBase_Graph.cxx @@ -100,9 +100,9 @@ GraphBase::SNode * GraphBase::Graph::GetInfo() const { Info->theName = Name() ; Info->theKind = Kind() ; if ( IsDataStreamNode() ) { - long Timeout ; + CORBA::Long Timeout ; SUPERV::KindOfDataStreamTrace DataStreamTrace ; - double DeltaTime ; + CORBA::Double DeltaTime ; ((GraphBase::StreamGraph * ) this)->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; Info->theTimeout = Timeout ; Info->theDataStreamTrace = DataStreamTrace ; diff --git a/src/GraphBase/DataFlowBase_Port.cxx b/src/GraphBase/DataFlowBase_Port.cxx index 7a6e685..9dfed9a 100644 --- a/src/GraphBase/DataFlowBase_Port.cxx +++ b/src/GraphBase/DataFlowBase_Port.cxx @@ -147,7 +147,7 @@ const GraphBase::ListOfCoords * GraphBase::Port::Coords() const { return _list_Coords ; } -bool GraphBase::Port::GetCoord( const int index , long &x , long &y ) const { +bool GraphBase::Port::GetCoord( const int index , CORBA::Long &x , CORBA::Long &y ) const { if ( IsEndSwitch() ) { return false ; } diff --git a/src/GraphBase/DataFlowBase_Port.hxx b/src/GraphBase/DataFlowBase_Port.hxx index 6077468..cfc0c5d 100644 --- a/src/GraphBase/DataFlowBase_Port.hxx +++ b/src/GraphBase/DataFlowBase_Port.hxx @@ -146,7 +146,7 @@ namespace GraphBase { int GetCoord() const ; bool GetCoord( int *x , int *y ) const ; const GraphBase::ListOfCoords * Coords() const ; - bool GetCoord( const int index , long &x , long &y ) const ; + bool GetCoord( const int index , CORBA::Long &x , CORBA::Long &y ) const ; } ; diff --git a/src/GraphBase/DataFlowBase_StreamGraph.cxx b/src/GraphBase/DataFlowBase_StreamGraph.cxx index f142364..176852a 100644 --- a/src/GraphBase/DataFlowBase_StreamGraph.cxx +++ b/src/GraphBase/DataFlowBase_StreamGraph.cxx @@ -84,9 +84,9 @@ GraphBase::StreamGraph::~StreamGraph() { cdebug << "GraphBase::StreamGraph::~StreamGraph" << endl ; } -bool GraphBase::StreamGraph::SetStreamParams( const long Timeout , +bool GraphBase::StreamGraph::SetStreamParams( CORBA::Long Timeout , const SUPERV::KindOfDataStreamTrace DataStreamTrace , - const double DeltaTime ) { + CORBA::Double DeltaTime ) { _Timeout = Timeout ; _DataStreamTrace = DataStreamTrace ; _DeltaTime = DeltaTime ; @@ -95,9 +95,9 @@ bool GraphBase::StreamGraph::SetStreamParams( const long Timeout , return true ; } -void GraphBase::StreamGraph::StreamParams( long & Timeout , +void GraphBase::StreamGraph::StreamParams( CORBA::Long & Timeout , SUPERV::KindOfDataStreamTrace & DataStreamTrace , - double & DeltaTime ) const { + CORBA::Double & DeltaTime ) const { Timeout = _Timeout ; DataStreamTrace = _DataStreamTrace ; DeltaTime = _DeltaTime ; diff --git a/src/GraphBase/DataFlowBase_StreamGraph.hxx b/src/GraphBase/DataFlowBase_StreamGraph.hxx index c33133a..6f6378d 100644 --- a/src/GraphBase/DataFlowBase_StreamGraph.hxx +++ b/src/GraphBase/DataFlowBase_StreamGraph.hxx @@ -60,12 +60,12 @@ namespace GraphBase { ~StreamGraph() ; - bool SetStreamParams( const long Timeout , + bool SetStreamParams( CORBA::Long Timeout , const SUPERV::KindOfDataStreamTrace DataStreamTrace , - const double DeltaTime ) ; - void StreamParams( long & Timeout , + CORBA::Double DeltaTime ) ; + void StreamParams( CORBA::Long & Timeout , SUPERV::KindOfDataStreamTrace & DataStreamTrace , - double & DeltaTime ) const ; + CORBA::Double & DeltaTime ) const ; bool CreateStreamTopology( const char * aDirectory ) ; diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.hxx b/src/GraphEditor/DataFlowEditor_DataFlow.hxx index bbe2312..4699d22 100644 --- a/src/GraphEditor/DataFlowEditor_DataFlow.hxx +++ b/src/GraphEditor/DataFlowEditor_DataFlow.hxx @@ -199,7 +199,7 @@ namespace GraphEditor { const char * FromServiceParameterName , const char * ToNodeName , const char * ToServiceParameterName , - const int index , long &X , long &Y ) ; + const int index , CORBA::Long &X , CORBA::Long &Y ) ; bool AddInputData( const char * ToNodeName , const char * ToParameterName , diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.lxx b/src/GraphEditor/DataFlowEditor_DataFlow.lxx index a48e23c..0dde219 100644 --- a/src/GraphEditor/DataFlowEditor_DataFlow.lxx +++ b/src/GraphEditor/DataFlowEditor_DataFlow.lxx @@ -378,7 +378,7 @@ inline bool GraphEditor::DataFlow::GetLinkCoord( const char* FromServiceParameterName , const char* ToNodeName , const char* ToServiceParameterName , - const int index , long &X , long &Y ) { + const int index , CORBA::Long &X , CORBA::Long &Y ) { return GraphEditor::OutNode::GetLinkCoord( FromNodeName , FromServiceParameterName , ToNodeName , diff --git a/src/GraphEditor/DataFlowEditor_OutNode.cxx b/src/GraphEditor/DataFlowEditor_OutNode.cxx index 52d6601..6bc6b01 100644 --- a/src/GraphEditor/DataFlowEditor_OutNode.cxx +++ b/src/GraphEditor/DataFlowEditor_OutNode.cxx @@ -925,7 +925,7 @@ bool GraphEditor::OutNode::GetLinkCoord( const char* FromNodeName , const char* FromServiceParameterName , const char* ToNodeName , const char* ToServiceParameterName , - const int index , long &X , long &Y ) { + const int index , CORBA::Long &X , CORBA::Long &Y ) { GraphBase::InPort * anInPort = Graph()->GetChangeInPort( ToNodeName , ToServiceParameterName ) ; // cdebug << "GraphEditor::OutNode::GetLinkCoord " << ToNodeName << "( " << ToServiceParameterName diff --git a/src/GraphEditor/DataFlowEditor_OutNode.hxx b/src/GraphEditor/DataFlowEditor_OutNode.hxx index 4369702..f5a30c6 100644 --- a/src/GraphEditor/DataFlowEditor_OutNode.hxx +++ b/src/GraphEditor/DataFlowEditor_OutNode.hxx @@ -276,7 +276,7 @@ namespace GraphEditor { const char* FromServiceParameterName , const char* ToNodeName , const char* ToServiceParameterName , - const int index , long &X , long &Y ) ; + const int index , CORBA::Long &X , CORBA::Long &Y ) ; // bool IsValid(bool kLoopSwitch = true ) { diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx index a58cbb5..c2fe717 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx @@ -73,8 +73,8 @@ void SUPERVGUI_CanvasLink::createPrs() addPoint(myInputPort->getConnectionPoint()); } if (!myMain->getCanvas()->isControlView()) { - long x, y; - for (int i = 0; i < myLink->CoordsSize(); i++) { + CORBA::Long x, y; + for (CORBA::Long i = 0; i < myLink->CoordsSize(); i++) { myLink->Coords(i+1, x, y); addPoint(QPoint(x, y), i+1); } diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx index ffec213..4e4079b 100644 --- a/src/SUPERVGUI/SUPERVGUI_Main.cxx +++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx @@ -1750,8 +1750,8 @@ SUPERVGUI_DSGraphParameters::~SUPERVGUI_DSGraphParameters() { Sets data function */ void SUPERVGUI_DSGraphParameters::setData() { - double aDeltaTime; - long aTimeOut; + CORBA::Double aDeltaTime; + CORBA::Long aTimeOut; SUPERV::KindOfDataStreamTrace aDataStreamTrace; // myGraph->StreamParams(aTimeOut, aDataStreamTrace, aDeltaTime); diff --git a/src/Supervision/CNode_Impl.cxx b/src/Supervision/CNode_Impl.cxx index 31a2dbe..ba0bbb8 100644 --- a/src/Supervision/CNode_Impl.cxx +++ b/src/Supervision/CNode_Impl.cxx @@ -373,8 +373,8 @@ bool CNode_Impl::IsHeadGraph() { endService( "CNode_Impl::IsHeadGraph" ); return RetVal ; } -long CNode_Impl::GraphLevel() { - long RetVal = 0 ; +CORBA::Long CNode_Impl::GraphLevel() { + CORBA::Long RetVal = 0 ; beginService( "CNode_Impl::GraphLevel" ); RetVal = DataFlowEditor()->Graph()->GraphMacroLevel() ; endService( "CNode_Impl::GraphLevel" ); @@ -569,7 +569,7 @@ bool CNode_Impl::SetComment( const char * aDataFlowComment ) { return RetVal ; } -void CNode_Impl::Coords(long X , long Y ) { +void CNode_Impl::Coords(CORBA::Long X , CORBA::Long Y ) { // beginService( "CNode_Impl::Coords" ); if ( DataFlowEditor()->IsEditing() ) { if ( _IsNode ) { @@ -581,9 +581,9 @@ void CNode_Impl::Coords(long X , long Y ) { } // endService( "CNode_Impl::Coords" ); } -long CNode_Impl::X() { +CORBA::Long CNode_Impl::X() { // beginService( "CNode_Impl::X" ); - long RetVal ; + CORBA::Long RetVal ; if ( _IsNode ) { RetVal = DataFlowNode()->XCoordinate() ; } @@ -593,9 +593,9 @@ long CNode_Impl::X() { // endService( "CNode_Impl::X" ); return RetVal ; } -long CNode_Impl::Y() { +CORBA::Long CNode_Impl::Y() { // beginService( "CNode_Impl::Y" ); - long RetVal ; + CORBA::Long RetVal ; if ( _IsNode ) { RetVal = DataFlowNode()->YCoordinate() ; } @@ -1488,9 +1488,9 @@ SUPERV::ListOfStreamLinks * CNode_Impl::StreamLinks() { return ( RetVal._retn() ) ; } -long CNode_Impl::SubGraph() { +CORBA::Long CNode_Impl::SubGraph() { // beginService( "CNode_Impl::SubGraph" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( _IsNode ) { RetVal = DataFlowNode()->SubGraph() ; } @@ -1498,9 +1498,9 @@ long CNode_Impl::SubGraph() { return RetVal ; } -long CNode_Impl::SubStreamGraph() { +CORBA::Long CNode_Impl::SubStreamGraph() { // beginService( "CNode_Impl::SubStreamGraph" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( _IsNode ) { RetVal = DataFlowNode()->SubStreamGraph() ; } @@ -1540,9 +1540,9 @@ SUPERV::GraphState CNode_Impl::State() { // endService( "CNode_Impl::State" ); return RetVal ; } -long CNode_Impl::Thread() { +CORBA::Long CNode_Impl::Thread() { // beginService( "CNode_Impl::Thread" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; GraphExecutor::DataFlow * aDataFlowExecutor = DataFlowEditor()->Executor() ; if ( aDataFlowExecutor ) { if ( _IsNode ) { @@ -1864,8 +1864,8 @@ bool CNode_Impl::Resume() { return RetVal ; } -long CNode_Impl::CpuUsed() { - long RetVal = 0 ; +CORBA::Long CNode_Impl::CpuUsed() { + CORBA::Long RetVal = 0 ; GraphExecutor::DataFlow * aDataFlowExecutor = DataFlowEditor()->Executor() ; if ( aDataFlowExecutor ) { if ( _IsNode ) { diff --git a/src/Supervision/CNode_Impl.hxx b/src/Supervision/CNode_Impl.hxx index 19ca441..23c53d4 100644 --- a/src/Supervision/CNode_Impl.hxx +++ b/src/Supervision/CNode_Impl.hxx @@ -158,9 +158,9 @@ class CNode_Impl : public POA_SUPERV::CNode , } } ; - virtual void Coords( const long X , const long Y ) ; - virtual long X() ; - virtual long Y() ; + virtual void Coords( CORBA::Long X , CORBA::Long Y ) ; + virtual CORBA::Long X() ; + virtual CORBA::Long Y() ; virtual SUPERV::Port_ptr Port( const char * aParameterName ) ; @@ -202,7 +202,7 @@ class CNode_Impl : public POA_SUPERV::CNode , virtual bool IsFlowMacro() ; virtual bool IsStreamMacro() ; virtual bool IsHeadGraph() ; - virtual long GraphLevel() ; + virtual CORBA::Long GraphLevel() ; virtual bool IsComputing() ; virtual bool IsFactory() ; virtual bool IsInLine() ; @@ -212,8 +212,8 @@ class CNode_Impl : public POA_SUPERV::CNode , virtual bool IsSwitch() ; virtual bool IsEndSwitch() ; - virtual long SubGraph() ; - virtual long SubStreamGraph() ; + virtual CORBA::Long SubGraph() ; + virtual CORBA::Long SubStreamGraph() ; // mkr : PAL8060 : this method is not used //virtual bool IsLinked(const char * ToServiceParameterName ) ; @@ -232,7 +232,7 @@ class CNode_Impl : public POA_SUPERV::CNode , virtual SUPERV::ControlState Control() ; virtual void ControlClear() ; - virtual long Thread() ; + virtual CORBA::Long Thread() ; GraphExecutor::AutomatonState AutoState() ; @@ -251,9 +251,9 @@ class CNode_Impl : public POA_SUPERV::CNode , virtual bool SuspendDone() ; virtual bool Resume() ; - virtual long CpuUsed() ; + virtual CORBA::Long CpuUsed() ; - virtual bool IsExecuting(); + virtual CORBA::Boolean IsExecuting(); } ; diff --git a/src/Supervision/Graph_Impl.cxx b/src/Supervision/Graph_Impl.cxx index a00e43f..5eb33e4 100644 --- a/src/Supervision/Graph_Impl.cxx +++ b/src/Supervision/Graph_Impl.cxx @@ -1743,16 +1743,16 @@ bool Graph_Impl::IsReadOnly() { return RetVal ; } -long Graph_Impl::LevelMax() { +CORBA::Long Graph_Impl::LevelMax() { // beginService( "Graph_Impl::LevelMax" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( !IsMacro() ) { RetVal = DataFlowEditor()->LevelMax() ; } // endService( "Graph_Impl::LevelMax" ); return RetVal ; } -SUPERV::ListOfNodes * Graph_Impl::LevelNodes(long aLevel ) { +SUPERV::ListOfNodes * Graph_Impl::LevelNodes(CORBA::Long aLevel ) { // beginService( "Graph_Impl::LevelNodes" ); SUPERV::ListOfNodes_var RetVal = new SUPERV::ListOfNodes; if ( !IsMacro() ) { @@ -1778,27 +1778,27 @@ SUPERV::ListOfNodes * Graph_Impl::LevelNodes(long aLevel ) { // endService( "Graph_Impl::LevelNodes" ); return ( RetVal._retn() ) ; } -long Graph_Impl::ThreadsMax() { +CORBA::Long Graph_Impl::ThreadsMax() { // beginService( "Graph_Impl::ThreadsMax" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( !IsMacro() ) { RetVal = DataFlowEditor()->ThreadsMax() ; } // endService( "Graph_Impl::ThreadsMax" ); return RetVal ; } -long Graph_Impl::Threads() { +CORBA::Long Graph_Impl::Threads() { // beginService( "Node_Impl::Threads" ); - long RetVal = false ; + CORBA::Long RetVal = false ; if ( !IsMacro() ) { RetVal = DataFlowExecutor()->Threads() ; } // endService( "Node_Impl::Threads" ); return RetVal ; } -long Graph_Impl::SuspendedThreads() { +CORBA::Long Graph_Impl::SuspendedThreads() { // beginService( "Node_Impl::SuspendedThreads" ); - long RetVal = false ; + CORBA::Long RetVal = false ; if ( !IsMacro() ) { RetVal = DataFlowExecutor()->SuspendedThreads() ; } @@ -2021,9 +2021,9 @@ bool Graph_Impl::EventW( SUPERV::CNode_out aNode , return RetVal ; } -long Graph_Impl::EventQSize() { +CORBA::Long Graph_Impl::EventQSize() { // beginService( "Graph_Impl::EventQSize" ); - long QSize = -1 ; + CORBA::Long QSize = -1 ; if ( pthread_mutex_lock( &_MutexExecutorWait ) ) { perror("pthread_mutex_lock _MutexExecutorWait") ; exit( 0 ) ; @@ -2039,13 +2039,13 @@ long Graph_Impl::EventQSize() { return QSize ; } -long Graph_Impl::LastLevelDone() { +CORBA::Long Graph_Impl::LastLevelDone() { // beginService( "Graph_Impl::LastLevelDone" ); if ( pthread_mutex_lock( &_MutexExecutorWait ) ) { perror("pthread_mutex_lock _MutexExecutorWait") ; exit( 0 ) ; } - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( DataFlowExecutor() && !IsMacro() ) { RetVal = DataFlowExecutor()->LastLevelDone() ; } @@ -2057,9 +2057,9 @@ long Graph_Impl::LastLevelDone() { return RetVal ; } -long Graph_Impl::SubGraphsNumber() { +CORBA::Long Graph_Impl::SubGraphsNumber() { // beginService( "Graph_Impl::SubGraphsNumber" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( DataFlowEditor()->IsExecutable() && !IsMacro() ) { RetVal = DataFlowEditor()->SubGraphsNumber() ; } @@ -2067,7 +2067,7 @@ long Graph_Impl::SubGraphsNumber() { return RetVal ; } -SUPERV::ListOfNodes * Graph_Impl::SubGraphsNodes( const long aSubGraphNumber ) { +SUPERV::ListOfNodes * Graph_Impl::SubGraphsNodes( CORBA::Long aSubGraphNumber ) { beginService( "Graph_Impl::SubGraphsNodes" ); SUPERV::ListOfNodes_var RetVal = new SUPERV::ListOfNodes ; if ( DataFlowEditor()->IsEditing() && !IsMacro() ) { @@ -2459,9 +2459,9 @@ bool Graph_Impl::Merge(const SUPERV::Graph_ptr aGraph , map< string , int > & aM DataFlowEditor()->Graph()->GetGraphNode( aMapOfNodes[ aLinkToNodeName->c_str() ] )->Name() , InPort->Name() ) ; if ( RetVal ) { - int j ; + CORBA::Long j ; for ( j = 1 ; j <= aLink->CoordsSize() ; j++ ) { - long X , Y ; + CORBA::Long X , Y ; RetVal = aLink->Coords( j , X , Y ) ; if ( !RetVal ) break ; diff --git a/src/Supervision/Graph_Impl.hxx b/src/Supervision/Graph_Impl.hxx index b8515c7..e8060f0 100644 --- a/src/Supervision/Graph_Impl.hxx +++ b/src/Supervision/Graph_Impl.hxx @@ -176,21 +176,21 @@ class Graph_Impl : public POA_SUPERV::Graph , virtual bool IsExecutable() ; virtual bool IsEditing() ; - virtual bool IsExecuting() ; + virtual CORBA::Boolean IsExecuting() ; virtual bool IsReadOnly() ; - virtual long LevelMax() ; - virtual SUPERV::ListOfNodes * LevelNodes(long aLevel ) ; - virtual long ThreadsMax() ; - virtual long Threads() ; - virtual long SuspendedThreads() ; + virtual CORBA::Long LevelMax() ; + virtual SUPERV::ListOfNodes * LevelNodes(CORBA::Long aLevel ) ; + virtual CORBA::Long ThreadsMax() ; + virtual CORBA::Long Threads() ; + virtual CORBA::Long SuspendedThreads() ; virtual bool Run() ; // called on "Execute Graph" command virtual bool Start() ; // called on "Execute Graph Step-by-Step" command virtual bool Begin() ; - virtual long LastLevelDone() ; + virtual CORBA::Long LastLevelDone() ; virtual bool EventNoW( SUPERV::CNode_out aNode , SUPERV::GraphEvent & anEvent , @@ -201,10 +201,10 @@ class Graph_Impl : public POA_SUPERV::Graph , virtual bool EventW( SUPERV::CNode_out aNode , SUPERV::GraphEvent & anEvent , SUPERV::GraphState & aState ) ; - virtual long EventQSize() ; + virtual CORBA::Long EventQSize() ; - virtual long SubGraphsNumber() ; - virtual SUPERV::ListOfNodes * SubGraphsNodes( const long aSubGraphNumber ) ; + virtual CORBA::Long SubGraphsNumber() ; + virtual SUPERV::ListOfNodes * SubGraphsNodes( CORBA::Long aSubGraphNumber ) ; virtual bool Merge(const SUPERV::Graph_ptr aGraph ) ; virtual bool Merge(const SUPERV::Graph_ptr aGraph , map< string , int > & aMapOfNodes ) ; diff --git a/src/Supervision/Link_Impl.cxx b/src/Supervision/Link_Impl.cxx index cf36025..ed09d8e 100644 --- a/src/Supervision/Link_Impl.cxx +++ b/src/Supervision/Link_Impl.cxx @@ -217,18 +217,18 @@ GraphBase::SLink * Link_Impl::Info() { return RetVal ; } -long Link_Impl::CoordsSize() { +CORBA::Long Link_Impl::CoordsSize() { // beginService( "Link_Impl::CoordsSize" ) ; - long RetVal = _DataFlowEditor->GetLinkCoordSize( _DataFlowOutNode->Name() , + CORBA::Long RetVal = _DataFlowEditor->GetLinkCoordSize( _DataFlowOutNode->Name() , _OutputParameterName , _DataFlowNode->Name() , _InputParameterName ) ; // endService( "Link_Impl::CoordsSize" ); return RetVal ; } -bool Link_Impl::AddCoord( const long index , - const long X , - const long Y ) { +bool Link_Impl::AddCoord( CORBA::Long index , + CORBA::Long X , + CORBA::Long Y ) { // beginService( "Link_Impl::AddCoord" ) ; bool RetVal = _DataFlowEditor->AddLinkCoord( _DataFlowOutNode->Name() , _OutputParameterName , @@ -238,9 +238,9 @@ bool Link_Impl::AddCoord( const long index , // endService( "Link_Impl::AddCoord" ); return RetVal ; } -bool Link_Impl::ChangeCoord( const long index , - const long X , - const long Y ) { +bool Link_Impl::ChangeCoord( CORBA::Long index , + CORBA::Long X , + CORBA::Long Y ) { // beginService( "Link_Impl::ChangeCoord" ) ; bool RetVal = _DataFlowEditor->ChangeLinkCoord( _DataFlowOutNode->Name() , _OutputParameterName , @@ -250,7 +250,7 @@ bool Link_Impl::ChangeCoord( const long index , // endService( "Link_Impl::ChangeCoord" ); return RetVal ; } -bool Link_Impl::RemoveCoord( const long index ) { +bool Link_Impl::RemoveCoord( CORBA::Long index ) { // beginService( "Link_Impl::RemoveCoord" ) ; bool RetVal = _DataFlowEditor->RemoveLinkCoord( _DataFlowOutNode->Name() , _OutputParameterName , @@ -260,7 +260,7 @@ bool Link_Impl::RemoveCoord( const long index ) { // endService( "Link_Impl::RemoveCoord" ); return RetVal ; } -bool Link_Impl::Coords( const long index , long & X , long & Y ) { +bool Link_Impl::Coords( CORBA::Long index , CORBA::Long & X , CORBA::Long & Y ) { // beginService( "Link_Impl::Coords" ) ; bool RetVal = _DataFlowEditor->GetLinkCoord( _DataFlowOutNode->Name() , _OutputParameterName , diff --git a/src/Supervision/Link_Impl.hxx b/src/Supervision/Link_Impl.hxx index 059cb6b..1f58e3a 100644 --- a/src/Supervision/Link_Impl.hxx +++ b/src/Supervision/Link_Impl.hxx @@ -98,15 +98,15 @@ class Link_Impl : public POA_SUPERV::Link , virtual GraphBase::SLink * Info() ; - virtual long CoordsSize() ; - virtual bool AddCoord( const long index , - const long X , - const long Y ) ; - virtual bool ChangeCoord( const long index , - const long X , - const long Y ) ; - virtual bool RemoveCoord( const long index ) ; - virtual bool Coords( const long index , long & X , long & Y ) ; + virtual CORBA::Long CoordsSize() ; + virtual bool AddCoord( CORBA::Long index , + CORBA::Long X , + CORBA::Long Y ) ; + virtual bool ChangeCoord( CORBA::Long index , + CORBA::Long X , + CORBA::Long Y ) ; + virtual bool RemoveCoord( CORBA::Long index ) ; + virtual bool Coords( CORBA::Long index , CORBA::Long & X , CORBA::Long & Y ) ; virtual bool IsValid(); // returns true if inPort() and outPort() are type-compatible diff --git a/src/Supervision/StreamGraph_Impl.cxx b/src/Supervision/StreamGraph_Impl.cxx index d123cf0..4999305 100644 --- a/src/Supervision/StreamGraph_Impl.cxx +++ b/src/Supervision/StreamGraph_Impl.cxx @@ -425,9 +425,9 @@ SUPERV::ListOfStreamLinks * StreamGraph_Impl::StreamLinks( GraphBase::ComputingN return ( RetVal._retn() ) ; } -bool StreamGraph_Impl::SetStreamParams( const long Timeout , +bool StreamGraph_Impl::SetStreamParams( CORBA::Long Timeout , const SUPERV::KindOfDataStreamTrace DataStreamTrace , - const double DeltaTime ) { + CORBA::Double DeltaTime ) { bool sts = false ; if ( !IsMacro() ) { sts = DataFlowEditor()->StreamGraph()->SetStreamParams( Timeout , DataStreamTrace , DeltaTime ) ; @@ -438,17 +438,17 @@ bool StreamGraph_Impl::SetStreamParams( const long Timeout , return sts ; } -void StreamGraph_Impl::StreamParams( long & Timeout , +void StreamGraph_Impl::StreamParams( CORBA::Long & Timeout , SUPERV::KindOfDataStreamTrace & DataStreamTrace , - double & DeltaTime ) { + CORBA::Double & DeltaTime ) { if ( !IsMacro() ) { DataFlowEditor()->StreamGraph()->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; } } -long StreamGraph_Impl::SubStreamGraphsNumber() { +CORBA::Long StreamGraph_Impl::SubStreamGraphsNumber() { // beginService( "StreamGraph_Impl::StreamGraphsNumber" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( DataFlowEditor()->IsExecutable() && !IsMacro() ) { RetVal = DataFlowEditor()->SubStreamGraphsNumber() ; } @@ -456,7 +456,7 @@ long StreamGraph_Impl::SubStreamGraphsNumber() { return RetVal ; } -SUPERV::ListOfNodes * StreamGraph_Impl::SubStreamGraphsNodes( const long aSubStreamGraphNumber ) { +SUPERV::ListOfNodes * StreamGraph_Impl::SubStreamGraphsNodes( CORBA::Long aSubStreamGraphNumber ) { beginService( "StreamGraph_Impl::SubStreamGraphsNodes" ); SUPERV::ListOfNodes_var RetVal = new SUPERV::ListOfNodes ; if ( DataFlowEditor()->IsEditing() && !IsMacro() ) { @@ -566,9 +566,9 @@ bool StreamGraph_Impl::StreamMerge(const SUPERV::StreamGraph_ptr aStreamGraph ) //cout << "Graph_Impl::StreamMerge " << aLinkFromNodeName << "(" << OutPort->Name() << ") ---> " // << aLinkToNodeName << "(" << InPort->Name() << ") RetVal" << RetVal << endl ; if ( RetVal ) { - int j ; + CORBA::Long j ; for ( j = 1 ; j <= aLink->CoordsSize() ; j++ ) { - long X , Y ; + CORBA::Long X , Y ; RetVal = aLink->Coords( j , X , Y ) ; if ( !RetVal ) break ; diff --git a/src/Supervision/StreamGraph_Impl.hxx b/src/Supervision/StreamGraph_Impl.hxx index 58bca48..474a4e3 100644 --- a/src/Supervision/StreamGraph_Impl.hxx +++ b/src/Supervision/StreamGraph_Impl.hxx @@ -80,15 +80,15 @@ class StreamGraph_Impl : public POA_SUPERV::StreamGraph , virtual SUPERV::ListOfStreamLinks * StreamLinks( GraphBase::ComputingNode * aNode , const char * anInputParam ) ; - virtual bool SetStreamParams( const long Timeout , + virtual bool SetStreamParams( CORBA::Long Timeout , const SUPERV::KindOfDataStreamTrace DataStreamTrace , - const double DeltaTime ) ; - virtual void StreamParams( long & Timeout , + CORBA::Double DeltaTime ) ; + virtual void StreamParams( CORBA::Long & Timeout , SUPERV::KindOfDataStreamTrace & DataStreamTrace , - double & DeltaTime ) ; + CORBA::Double & DeltaTime ) ; - virtual long SubStreamGraphsNumber() ; - virtual SUPERV::ListOfNodes * SubStreamGraphsNodes( const long aSubStreamGraphNumber ) ; + virtual CORBA::Long SubStreamGraphsNumber() ; + virtual SUPERV::ListOfNodes * SubStreamGraphsNodes( CORBA::Long aSubStreamGraphNumber ) ; virtual SUPERV::Graph_ptr ToFlowGraph() ; diff --git a/src/Supervision/StreamPort_Impl.cxx b/src/Supervision/StreamPort_Impl.cxx index 9ca3891..4fb7a79 100644 --- a/src/Supervision/StreamPort_Impl.cxx +++ b/src/Supervision/StreamPort_Impl.cxx @@ -225,7 +225,7 @@ bool StreamPort_Impl::Params( SUPERV::KindOfSchema & aKindOfSchema , return RetVal ; } -bool StreamPort_Impl::SetNumberOfValues( const long aNumberOfValues ) { +bool StreamPort_Impl::SetNumberOfValues( CORBA::Long aNumberOfValues ) { // beginService( "StreamPort_Impl::SetNumberOfValues" ); bool RetVal = false ; if ( !IsInput() ) { @@ -241,9 +241,9 @@ bool StreamPort_Impl::SetNumberOfValues( const long aNumberOfValues ) { return RetVal ; } -long StreamPort_Impl::NumberOfValues() { +CORBA::Long StreamPort_Impl::NumberOfValues() { // beginService( "StreamPort_Impl::NumberOfValues" ); - long RetVal = -1 ; + CORBA::Long RetVal = -1 ; if ( !IsInput() ) { GraphBase::OutDataStreamPort * anOutStreamPort = (GraphBase::OutDataStreamPort * ) DataFlowPort() ; RetVal = anOutStreamPort->NumberOfValues() ; diff --git a/src/Supervision/StreamPort_Impl.hxx b/src/Supervision/StreamPort_Impl.hxx index f351535..2b00067 100644 --- a/src/Supervision/StreamPort_Impl.hxx +++ b/src/Supervision/StreamPort_Impl.hxx @@ -77,8 +77,8 @@ class StreamPort_Impl : public Port_Impl , SUPERV::KindOfInterpolation & aKindOfInterpolation , SUPERV::KindOfExtrapolation & aKindOfExtrapolation ) ; - virtual bool SetNumberOfValues( const long aNumberOfValues ) ; - virtual long NumberOfValues() ; + virtual bool SetNumberOfValues( CORBA::Long aNumberOfValues ) ; + virtual CORBA::Long NumberOfValues() ; } ;