Join modifications from branch BR_DEBUG_3_2_0b1

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

diff --git a/src/Supervision/CNode_Impl.hxx b/src/Supervision/CNode_Impl.hxx
index abe1edb925cfb45a9d9e64f6058be9b91bf0328d..bc4fe8b541b73b7b4b9cbd86a3150c7782c6fc6b 100644 (file)
--- a/src/Supervision/CNode_Impl.hxx
+++ b/src/Supervision/CNode_Impl.hxx
@@ -1,13 +1,27 @@
 //  SUPERV Supervision : contains the implementation of interfaces of SuperVision described in SUPERV.idl
 //
-//  Copyright (C) 2003  CEA/DEN, EDF R&D
-//
-//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : CNode_Impl.hxx
 //  Author : Jean Rahuel
 //  Module : SUPERV
-//  $Header: 
 
 #ifndef _CNODE_IMPL_HXX_
 #define _CNODE_IMPL_HXX_
@@ -54,7 +68,8 @@ class CNode_Impl : public POA_SUPERV::CNode ,
                 const char * NodeName = NULLSTRING ,
                 const SUPERV::KindOfNode NodeKindOfNode = SUPERV::ComputingNode ,
                 const char * aFuncName = NULLSTRING ,
-                const SUPERV::ListOfStrings & aPythonFunction = SUPERV::ListOfStrings() ) ;
+                const SUPERV::ListOfStrings & aPythonFunction = SUPERV::ListOfStrings() ,
+               bool isCimpl = true ) ; // mkr : PAL11273 : C++ implementation by default
     CNode_Impl( CORBA::ORB_ptr orb ,
                PortableServer::POA_ptr poa ,
                PortableServer::ObjectId * contId , 
@@ -157,9 +172,9 @@ class CNode_Impl : public POA_SUPERV::CNode ,
             }
           } ;
 
-    virtual void Coords( const long X , const long Y ) ;
-    virtual long X() ;
-    virtual long Y() ;
+    virtual void Coords( CORBA::Long X , CORBA::Long Y ) ;
+    virtual CORBA::Long X() ;
+    virtual CORBA::Long Y() ;
 
     virtual SUPERV::Port_ptr Port( const char * aParameterName ) ;
 
@@ -201,7 +216,7 @@ class CNode_Impl : public POA_SUPERV::CNode ,
     virtual bool IsFlowMacro() ;
     virtual bool IsStreamMacro() ;
     virtual bool IsHeadGraph() ;
-    virtual long GraphLevel() ;
+    virtual CORBA::Long GraphLevel() ;
     virtual bool IsComputing() ;
     virtual bool IsFactory() ;
     virtual bool IsInLine() ;
@@ -211,10 +226,11 @@ class CNode_Impl : public POA_SUPERV::CNode ,
     virtual bool IsSwitch() ;
     virtual bool IsEndSwitch() ;
 
-    virtual long SubGraph() ;
-    virtual long SubStreamGraph() ;
+    virtual CORBA::Long SubGraph() ;
+    virtual CORBA::Long SubStreamGraph() ;
 
-    virtual bool IsLinked(const char * ToServiceParameterName ) ;
+  // mkr : PAL8060 : this method is not used
+  //virtual bool IsLinked(const char * ToServiceParameterName ) ;
     virtual bool HasInput(const char * ToServiceParameterName ) ;
 
 //    virtual SUPERV::Link_ptr GetLink(const char * ToServiceParameterName ) ;
@@ -230,7 +246,7 @@ class CNode_Impl : public POA_SUPERV::CNode ,
     virtual SUPERV::ControlState Control() ;
     virtual void ControlClear() ;
 
-    virtual long Thread() ;
+    virtual CORBA::Long Thread() ;
 
     GraphExecutor::AutomatonState AutoState() ;
 
@@ -249,15 +265,9 @@ class CNode_Impl : public POA_SUPERV::CNode ,
     virtual bool SuspendDone() ;
     virtual bool Resume() ;
 
-    virtual bool Run() ;
-    virtual bool ReRun() ;
-    virtual bool ReRunAt( const char * aNodeName ) ;
-    virtual bool ReStart() ;
-    virtual bool ReStartAt( const char * aNodeName ) ;
-
-    virtual long CpuUsed() ;
+    virtual CORBA::Long CpuUsed() ;
 
-    virtual bool IsExecuting();
+    virtual CORBA::Boolean IsExecuting();
 
 } ;