MacroNodes and omniORB4 porting

diff --git a/src/GraphExecutor/DataFlowExecutor_FiniteStateMachine.hxx b/src/GraphExecutor/DataFlowExecutor_FiniteStateMachine.hxx
index 1bed34ea968233746a40ce6a2bcc01e65e8288e6..f03fbdf7bf99189a714d36ced803fb2697a63169 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_FiniteStateMachine.hxx
+++ b/src/GraphExecutor/DataFlowExecutor_FiniteStateMachine.hxx
@@ -45,6 +45,8 @@
 //#include CORBA_SERVER_HEADER(SUPERV)
 #include <SALOME_LifeCycleCORBA.hxx>
 
+class Graph_Impl ;
+
 namespace GraphBase {
   class Graph ;
 }
@@ -176,10 +178,6 @@ namespace GraphExecutor {
       GraphExecutor::StateEventAction _ActionTable[ GraphExecutor::NumberOfAutomatonStates ]
                                                   [ GraphExecutor::NumberOfEvents ] ;
 
-#if omniORB_4_0_5
-      SUPERV::SuperG_var _SuperVisionComponent ;
-#endif
-
       pthread_mutex_t            _MutexPythonWait ;
       bool                       _MutexPythonLocked ;
 // Map between FuncName and corresponding Python Object Function
@@ -200,18 +198,13 @@ namespace GraphExecutor {
       pthread_cond_t    _JoinWait ;
       list< pthread_t > _ThreadList ;
 
+      Graph_Impl * _GraphImpl ;
+
     public :
 
       FiniteStateMachine() ;
       virtual ~FiniteStateMachine() {} ;
 
-#if omniORB_4_0_5
-      void SuperVisionComponent( SUPERV::SuperG_var mySuperVision ) {
-           _SuperVisionComponent = mySuperVision ; } ;
-      SUPERV::SuperG_var SuperVisionComponent() {
-                         return _SuperVisionComponent ; } ;
-#endif
-
       int ExecNumber() ;
       void Executed() ;
       void PyInitModule(bool) ;
@@ -258,6 +251,11 @@ namespace GraphExecutor {
       const GraphExecutor::StateEventAction NextAction( const GraphExecutor::AutomatonState & aState ,
                                                         const GraphExecutor::NodeEvent & anEvent ) const {
             return _ActionTable[ aState ][ anEvent ] ; } ;
+
+    void GraphImpl( Graph_Impl * aGraphImpl ) {// For GraphMNode ...
+         _GraphImpl = aGraphImpl ; } ;
+    Graph_Impl * GraphImpl() {
+                 return _GraphImpl ; } ;
   };
 
 };