OmniORB-4.1.0 porting

diff --git a/src/GraphBase/DataFlowBase_Base.cxx b/src/GraphBase/DataFlowBase_Base.cxx
index 12ca867205ea08691beabff9f54e825c0e5a908f..40c911bf269dc001db1129f415f265918ceb9794 100644 (file)
--- a/src/GraphBase/DataFlowBase_Base.cxx
+++ b/src/GraphBase/DataFlowBase_Base.cxx
@@ -66,14 +66,14 @@ char * GraphBase::Base::ObjectToString( CORBA::Object_ptr obj ) const {
   return _Orb->object_to_string( obj );
 }
 
-CORBA::Object_ptr GraphBase::Base::StringToObject( char * obj ) const {
+CORBA::Object_ptr GraphBase::Base::StringToObject( const char * obj ) const {
   return _Orb->string_to_object( obj );
 }
 
 ostream & GraphBase::Base::AnyValue( const CORBA::Any & anAny ) {
   switch (anAny.type()->kind()) {
     case CORBA::tk_string: {
-      char * t;
+      const char * t;
       anAny >>= t;
       *_fdebug << " " << t << " (tk_string)" << endl ;
       break;

diff --git a/src/GraphBase/DataFlowBase_Base.hxx b/src/GraphBase/DataFlowBase_Base.hxx
index 4dd042eef4ed65747d9b2ecb5b71fbd4a6388b7c..d96337730f4ebbd7ba33331f5b86666751a25203 100644 (file)
--- a/src/GraphBase/DataFlowBase_Base.hxx
+++ b/src/GraphBase/DataFlowBase_Base.hxx
@@ -198,7 +198,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 );
 

diff --git a/src/GraphBase/DataFlowBase_DataPort.cxx b/src/GraphBase/DataFlowBase_DataPort.cxx
index 7cd29b85109f74c61defad9e37ffba58331b7acd..7b0a17e17bf8e59305bfaca8c4c31681336a2a27 100644 (file)
--- a/src/GraphBase/DataFlowBase_DataPort.cxx
+++ b/src/GraphBase/DataFlowBase_DataPort.cxx
@@ -151,7 +151,7 @@ void GraphBase::DataPort::SetValue( const CORBA::Any * aDataValue ) {
 #endif
   switch (aDataValue->type()->kind()) { // Input Value
   case CORBA::tk_string: { // Input string Value
-    char * t;
+    const char * t;
     *aDataValue >>= t;
 #if ValueTrace
     cdebug << t << " (string)" ;
@@ -242,7 +242,7 @@ void GraphBase::DataPort::SetValue( const CORBA::Any * aDataValue ) {
         char t[40] ;
         sprintf( t , "%ld" , ll ) ;
         *theValue <<=  t ;
-        char *tt ;
+        const char *tt ;
         *theValue >>= tt ;
 #if ValueTrace
         cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ;
@@ -311,7 +311,7 @@ void GraphBase::DataPort::SetValue( const CORBA::Any * aDataValue ) {
         char t[40] ;
         sprintf( t , "%lf" , d ) ;
         *theValue <<=  t ;
-        char *tt ;
+        const char *tt ;
         *theValue >>= tt ;
 #if ValueTrace
         cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ;
@@ -473,7 +473,7 @@ const CORBA::Any GraphBase::DataPort::Value() const {
 //JR 30.03.2005    switch ( theValue->type()->kind() ) {
     switch ( theValue.type()->kind() ) {
     case CORBA::tk_string: {
-      char * t;
+      const char * t;
 //JR 30.03.2005      *theValue >>= t;
       theValue >>= t;
 //      cdebug << "GraphBase::DataPort::Value() : " << t << " (string) " << endl ;
@@ -583,7 +583,7 @@ void GraphBase::DataPort::StringValue(ostream & f ) const {
     const CORBA::Any * theValue = *_Value ;
     switch (theValue->type()->kind()) {
     case CORBA::tk_string:
-      char * t;
+      const char * t;
       *theValue >>= t;
       f << t << " (string)" ;
       break;

diff --git a/src/GraphBase/DataFlowBase_Graph.cxx b/src/GraphBase/DataFlowBase_Graph.cxx
index 6943ba82addfa881942e152a456849a845323c34..6c4998227fb9084d1f3b3ff9e41464b26b0956ea 100644 (file)
--- a/src/GraphBase/DataFlowBase_Graph.cxx
+++ b/src/GraphBase/DataFlowBase_Graph.cxx
@@ -1579,7 +1579,7 @@ bool GraphBase::Graph::AddInputData( const char* ToNodeName ,
   bool isUnknown = false;
   switch (aValue.type()->kind()) {
     case CORBA::tk_string:
-      char * t;
+      const char * t;
       aValue >>= t;
       cdebug << t << " (string) " ;
       if ( !strcmp( t, "Unknown CORBA::Any Type" ) ) 
@@ -1669,7 +1669,7 @@ bool GraphBase::Graph::ChangeInputData( const char * ToNodeName ,
             << ToServiceParameterName << "' , Any " ;
   switch (aValue.type()->kind()) {
     case CORBA::tk_string:
-      char * t;
+      const char * t;
       aValue >>= t;
       cdebug << t << " (string) " ;
       break;
@@ -1741,7 +1741,7 @@ bool GraphBase::Graph::AddInputData( const char* ToNodeName ,
       cdebug << t << " (string) " ;
       break;
     case CORBA::tk_double:
-      double d;
+      CORBA::Double d;
       theValue >>= d;
       cdebug << d << " (double) " ;
       break;

diff --git a/src/GraphBase/DataFlowBase_XmlHandler.cxx b/src/GraphBase/DataFlowBase_XmlHandler.cxx
index f7452898bca1923e6211f4273a031669363446bc..6a7448aa60c45c0ceb8eaa6b8110a774c02d42a2 100644 (file)
--- a/src/GraphBase/DataFlowBase_XmlHandler.cxx
+++ b/src/GraphBase/DataFlowBase_XmlHandler.cxx
@@ -718,7 +718,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             case CORBA::tk_string: {
 //Mandrake 10.1/Salome 3              aLink.aLinkValue <<= (char *) NULL ;
               aLink.aLinkValue <<= (char *) "" ;
-              char * t;
+              const char * t;
               aLink.aLinkValue >>= t;
 #if TRACE
               MESSAGE( t << " (string)" );
@@ -778,7 +778,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
               switch ( aLink.aLinkValue.type()->kind() ) {
               case CORBA::tk_string: {
                 aLink.aLinkValue <<= fieldvalue[depth].c_str() ;
-                char * t;
+                const char * t;
                 aLink.aLinkValue >>= t;
 #if TRACE
                 MESSAGE( t << " (string)" );

diff --git a/src/GraphEditor/DataFlowEditor_OutNode.cxx b/src/GraphEditor/DataFlowEditor_OutNode.cxx
index 1a4e2e00db54486f01b86814d3aa59b82bebae9e..6a2eda8b1f17dd93007ce2d6b66e111c16f16fe6 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_OutNode.cxx
+++ b/src/GraphEditor/DataFlowEditor_OutNode.cxx
@@ -1191,7 +1191,7 @@ bool GraphEditor::OutNode::LinkSaveXML( QDomDocument & Graph , QDomElement & lin
     valuetype.appendChild( aField ) ;
     switch (aLink.aLinkValue.type()->kind()) {
       case CORBA::tk_string: {
-        char* retstr ;
+        const char* retstr ;
         aLink.aLinkValue >>= retstr;
 //        f << Tabs << "       <value>" << retstr << "</value>" << endl ;
         QDomElement value = Graph.createElement( "value" ) ;
@@ -1217,7 +1217,7 @@ bool GraphEditor::OutNode::LinkSaveXML( QDomDocument & Graph , QDomElement & lin
         break ;
       }
       case CORBA::tk_double: {
-        double d;
+        CORBA::Double d;
         aLink.aLinkValue >>= d;
 //        f << Tabs << "       <value>" << d << "</value>" << endl ;
         QDomElement value = Graph.createElement( "value" ) ;
@@ -1336,13 +1336,13 @@ bool GraphEditor::OutNode::LinkSavePY( ostream &f , const char * aGraphName ,
       << ".Input( " ;
     switch (aLink.aLinkValue.type()->kind()) {
       case CORBA::tk_string: {
-        char* retstr ;
+        const char* retstr ;
         aLink.aLinkValue >>= retstr;
         f << "'" << retstr << "'" ;
         break ;
       }
       case CORBA::tk_double: {
-        double d;
+        CORBA::Double d;
         aLink.aLinkValue >>= d;
         f << d ;
         break ;

diff --git a/src/GraphExecutor/DataFlowExecutor_DynInvoke.cxx b/src/GraphExecutor/DataFlowExecutor_DynInvoke.cxx
index 9d840c6d92926522169e0c7bbeca1457c8d0e1e9..b8ab049a0f80d394d3c8e9e038933a7ae36f6e2d 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_DynInvoke.cxx
+++ b/src/GraphExecutor/DataFlowExecutor_DynInvoke.cxx
@@ -65,7 +65,7 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
 #if DynInvokeTrace
     switch ( Type ) {
     case CORBA::tk_string : {
-      char * t ;
+      const char * t ;
       data >>= t ;
       cdebug << "ArgIn" << i << " : " << ArgName << " Value " << t << " (string)" 
              << endl ;
@@ -84,7 +84,7 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
       break ;
     }
     case CORBA::tk_short : {
-      short s ;
+      CORBA::Short s ;
       data >>= s ;
       cdebug << "ArgIn" << i << " : " << ArgName << " Value " << s << " (short)" << endl ;
       break ;
@@ -96,13 +96,13 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
       break ;
     }
     case CORBA::tk_float : {
-      float f ;
+      CORBA::Float f ;
       data >>= f ;
       cdebug << "ArgIn" << i << " : " << ArgName << " Value " << f << " (float)" << endl ;
       break ;
     }
     case CORBA::tk_double : {
-      double d ;
+      CORBA::Double d ;
       data >>= d ;
       cdebug << "ArgIn" << i << " : " << ArgName << " Value " << d << " (double)" << endl ;
       break ;
@@ -135,7 +135,7 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
 #if DynInvokeTrace
     switch ( Type ) {
     case CORBA::tk_string : {
-      char * t ;
+      cont char * t ;
       data >>= t ;
       cdebug << "ArgOut" << i << " : " << ArgName << " Value " << t << " (string)" << endl ;
       break ;
@@ -153,7 +153,7 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
       break ;
     }
     case CORBA::tk_short : {
-      short s ;
+      CORBA::Short s ;
       data >>= s ;
       cdebug << "ArgOut" << i << " : " << ArgName << " Value " << s << " (short)" << endl ;
       break ;
@@ -165,13 +165,13 @@ void GraphExecutor::InNode::DynInvoke(Engines::Component_ptr objComponent ,
       break ;
     }
     case CORBA::tk_float : {
-      float f ;
+      CORBA::Float f ;
       data >>= f ;
       cdebug << "ArgOut" << i << " : " << ArgName << " Value " << f << " (float)" << endl ;
       break ;
     }
     case CORBA::tk_double : {
-      double d ;
+      CORBA::Double d ;
       data >>= d ;
       cdebug << "ArgOut" << i << " : " << ArgName << " Value " << d << " (double)" << endl ;
       break ;

diff --git a/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx b/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx
index b56f5e5d25268a7405272338447334e02c172a30..10bccd26fc443af0446a298c3051f53824e57a77 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx
+++ b/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx
@@ -3232,7 +3232,7 @@ void GraphExecutor::InNode::InParametersSet( bool & Err ,
       const char * Type = anInPort->GetServicesParameter().Parametertype ;
       switch ( D.Value.type()->kind() ) { // { string , long , double , objref }
       case CORBA::tk_string:
-        char * t;
+        const char * t;
         D.Value >>= t;
 #if InParametersSetTrace
         cdebug << t << " (string)" ;
@@ -3402,7 +3402,7 @@ void GraphExecutor::InNode::InParametersSet( bool & Err ,
 #endif
         break;
       case CORBA::tk_double:
-        double d;
+        CORBA::Double d;
         D.Value >>= d;
 #if InParametersSetTrace
         cdebug << d << " (double)" << endl ;
@@ -3630,7 +3630,7 @@ void GraphExecutor::InNode::InOutParametersSet( int nOutParams ,
 #if InParametersSetTrace
     switch (D.Value.type()->kind()) { // { string , long , double , objref }
     case CORBA::tk_string:
-      char * t;
+      const char * t;
       D.Value >>= t;
       cdebug << ThreadNo() << " " << t << "(string)" << endl ;
       break;
@@ -3645,7 +3645,7 @@ void GraphExecutor::InNode::InOutParametersSet( int nOutParams ,
       cdebug << ThreadNo() << " " << c << "(char)" << endl ;
       break;
     case CORBA::tk_short:
-      short s;
+      CORBA::Short s;
       D.Value >>= s;
       cdebug << ThreadNo() << " " << s << "(short)" << endl ;
       break;
@@ -3655,12 +3655,12 @@ void GraphExecutor::InNode::InOutParametersSet( int nOutParams ,
       cdebug << ThreadNo() << " " << l << "(CORBA::Long)" << endl ;
       break;
     case CORBA::tk_float:
-      float f;
+      CORBA::Float f;
       D.Value >>= f;
       cdebug << ThreadNo() << " " << f << "(float)" << endl ;
       break;
     case CORBA::tk_double:
-      double d;
+      CORBA::Double d;
       D.Value >>= d;
       cdebug << ThreadNo() << " " << d << "(double)" << endl ;
       break;
@@ -3719,7 +3719,7 @@ bool GraphExecutor::InNode::OutParametersSet( bool Err ,
         ServicesAnyData D = OutParametersList[i] ;
         switch (D.Value.type()->kind()) { // { string , long , double , objref }
         case CORBA::tk_string: {
-          char * t;
+          const char * t;
           D.Value >>= t;
 #if OutParametersSetTrace
           cdebug << ThreadNo() << " " << t << "(string)" << endl ;
@@ -3747,7 +3747,7 @@ bool GraphExecutor::InNode::OutParametersSet( bool Err ,
           break;
        }
         case CORBA::tk_short: {
-          short s;
+          CORBA::Short s;
           D.Value >>= s;
           CORBA::Long l = (CORBA::Long ) s ;
           D.Value <<= l ;
@@ -3765,7 +3765,7 @@ bool GraphExecutor::InNode::OutParametersSet( bool Err ,
           break;
        }
         case CORBA::tk_float: {
-          float f;
+          CORBA::Float f;
           D.Value >>= f;
           double d = (double ) f ;
 #ifdef REDHAT // mkr : debug for PAL12255
@@ -3780,7 +3780,7 @@ bool GraphExecutor::InNode::OutParametersSet( bool Err ,
           break;
        }
         case CORBA::tk_double: {
-          double d;
+          CORBA::Double d;
           D.Value >>= d;
 #if OutParametersSetTrace
           cdebug << ThreadNo() << " " << d << "(double)" << endl ;
@@ -3950,7 +3950,7 @@ bool GraphExecutor::InNode::OutParametersSet( bool Err ,
 #if OutParametersSetTrace
         switch ( anOutPort->Value().type()->kind() ) {
         case CORBA::tk_string:
-          char * t;
+          const char * t;
           (anOutPort->Value()) >>= t;
           cdebug << ThreadNo() << " Out" << i << " : " << t << "(string)" << endl ;
           break;
@@ -3965,7 +3965,7 @@ bool GraphExecutor::InNode::OutParametersSet( bool Err ,
           cdebug << ThreadNo() << " Out" << i << " : " << c << "(char)" << endl ;
           break;
         case CORBA::tk_short:
-          short s;
+          CORBA::Short s;
           (anOutPort->Value()) >>= s;
           cdebug << ThreadNo() << " Out" << i << " : " << s << "(short)" << endl ;
           break;
@@ -3975,12 +3975,12 @@ bool GraphExecutor::InNode::OutParametersSet( bool Err ,
           cdebug << ThreadNo() << " Out" << i << " : " << l << "(CORBA::Long)" << endl ;
           break;
         case CORBA::tk_float:
-          float f;
+          CORBA::Float f;
           (anOutPort->Value()) >>= f;
           cdebug << ThreadNo() << " Out" << i << " : " << f << "(float)" << endl ;
           break;
         case CORBA::tk_double:
-          double d;
+          CORBA::Double d;
           (anOutPort->Value()) >>= d;
           cdebug << ThreadNo() << " Out" << i << " : " << d << "(double)" << endl ;
           break;

diff --git a/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx b/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx
index d885612bf25af415501841deb51b096963faf1b4..fbb844039e11b407e5e1615867eaa533ddfc29be 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx
+++ b/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx
@@ -320,7 +320,7 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod ,
       sname = InParametersList[i].Name.c_str() ;
       switch ( data.type()->kind() ) {
       case CORBA::tk_string : {
-        char * t ;
+        const char * t ;
         data >>= t ;
         PyObject * ArgValue = Py_BuildValue( "s" , t ) ;
         PyTuple_SetItem( ArgsList , i , ArgValue ) ;
@@ -356,7 +356,7 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod ,
         break ;
       }
       case CORBA::tk_short : {
-        short s ;
+        CORBA::Short s ;
         data >>= s ;
         PyObject * ArgValue = Py_BuildValue( "h" , s ) ;
         PyTuple_SetItem( ArgsList , i , ArgValue ) ;
@@ -391,7 +391,7 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod ,
         break ;
       }
       case CORBA::tk_float : {
-        float f ;
+        CORBA::Float f ;
         data >>= f ;
         PyObject * ArgValue = Py_BuildValue( "f" , f ) ;
         PyTuple_SetItem( ArgsList , i , ArgValue ) ;
@@ -403,7 +403,7 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod ,
         break ;
       }
       case CORBA::tk_double : {
-        double d ;
+        CORBA::Double d ;
         data >>= d ;
         PyObject * ArgValue = Py_BuildValue( "d" , d ) ;
         PyTuple_SetItem( ArgsList , i , ArgValue ) ;