Join modifications from branch OCC_debug_for_3_2_0b1

[modules/superv.git] / src / Supervision / StreamGraph_Impl.cxx

diff --git a/src/Supervision/StreamGraph_Impl.cxx b/src/Supervision/StreamGraph_Impl.cxx
index d123cf02f46d2a6630fd7ac332b5c8a4fda80a10..49993051cc77fc51ac5213eb213aa9663edc568a 100644 (file)
--- 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 ;