Porting on Mandriva 64

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

diff --git a/src/Supervision/Graph_Impl.cxx b/src/Supervision/Graph_Impl.cxx
index a00e43fd791c8bbf36ec48cacd66db7348d0173b..5eb33e4115de4dc2c3dd4e85649985eaa880fba5 100644 (file)
--- 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 ;