Join modifications from branch OCC_debug_for_3_2_0b1

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

diff --git a/src/Supervision/Graph_Impl.hxx b/src/Supervision/Graph_Impl.hxx
index b8515c7dc18ab6a9ee4fa34c3d35b7892e512918..e8060f0e1a4aee7d40e1b5bf021e36f053532ac8 100644 (file)
--- 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 ) ;