Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/superv.git] / src / GraphBase / DataFlowBase_Base.hxx

diff --git a/src/GraphBase/DataFlowBase_Base.hxx b/src/GraphBase/DataFlowBase_Base.hxx
index 7d7988b9669e8fae256cd71f2b0005fc546a90ad..60cb36e660b913c567362d2f68eeb4de33bd6941 100644 (file)
--- a/src/GraphBase/DataFlowBase_Base.hxx
+++ b/src/GraphBase/DataFlowBase_Base.hxx
@@ -17,14 +17,13 @@
 //  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
 //  File   : DataFlowBase_Base.hxx
 //  Author : Jean Rahuel, CEA
 //  Module : SUPERV
-//  $Header:
 
 #ifndef _DATAFLOW_BASE_HXX
 #define _DATAFLOW_BASE_HXX
@@ -49,8 +48,6 @@
 #include "utilities.h"
 #include "OpUtil.hxx"
 
-#define omniORB_4_0_5 1
-
 #define ExitWhenNodeAborted 1
 
 extern char *SuperVision_Version ;
@@ -58,6 +55,7 @@ extern char *SuperVision_Version ;
 extern char *NULLSTRING ;
 
 extern char *FACTORYSERVER ;
+extern char *FACTORYSERVERPY ;
 
 inline char * my_strdup( const char * s ) {
   if (s == NULL) return NULL;
@@ -85,14 +83,14 @@ inline char * my_strblkdup( const char * s ) {
   return t;
 }
 
-string DataStreamTypeToString( const SALOME_ModuleCatalog::DataStreamType aDataStreamType ) ;
-SALOME_ModuleCatalog::DataStreamType StringToDataStreamType( const char * aIdlType ) ;
+//string DataStreamTypeToString( const SALOME_ModuleCatalog::DataStreamType aDataStreamType ) ;
+int StringToDataStreamType( const char * aIdlType ) ;
 
 string KindOfDataStreamTraceToString( SUPERV::KindOfDataStreamTrace aDataStreamTrace ) ;
 
 string DataStreamDependencyToString( const SALOME_ModuleCatalog::DataStreamDependency aDataStreamDependency ) ;
 
-string DataStreamToString( const SALOME_ModuleCatalog::DataStreamType aDataStreamType ) ;
+string DataStreamToString( const char* aDataStreamType ) ;
 
 //enum StatusOfPort { NotConnected , PortConnected , PortAndDataConnected ,
 enum StatusOfPort { NotConnected , PortConnected ,
@@ -201,7 +199,7 @@ namespace GraphBase {
                      int * prof_debug , ofstream * fdebug ) ;
 
       char * ObjectToString( CORBA::Object_ptr obj ) const ;
-      CORBA::Object_ptr StringToObject(char * obj ) const ;
+      CORBA::Object_ptr StringToObject(const char * obj ) const ;
 
       ostream & AnyValue( const CORBA::Any & anAny );
 
@@ -224,6 +222,6 @@ namespace GraphBase {
 
 } ;
 
-ostream & operator<< (ostream &,const SALOME_ModuleCatalog::DataStreamType &);
+//ostream & operator<< (ostream &,const SALOME_ModuleCatalog::DataStreamType &);
 
 #endif