Join modifications from branch OCC_debug_for_3_2_0b1

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

diff --git a/src/Supervision/CNode_Impl.cxx b/src/Supervision/CNode_Impl.cxx
index 31a2dbe4ec277f88eebb85ce8990a906f90f66e7..ba0bbb89ef4081612bce464d74a6efc4774a055b 100644 (file)
--- 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 ) {