OmniORB-4.1.0 porting

diff --git a/src/GenericObj/SALOME_GenericObj_i.cc b/src/GenericObj/SALOME_GenericObj_i.cc
index fe837e3fdfa2fffb382aa5ff4ec7954e467f2c22..2760b73db23489ca083acbaa7a29ac8a454ea7a7 100644 (file)
--- a/src/GenericObj/SALOME_GenericObj_i.cc
+++ b/src/GenericObj/SALOME_GenericObj_i.cc
@@ -42,9 +42,9 @@ GenericObj_i::GenericObj_i(PortableServer::POA_ptr thePOA): myRefCounter(1){
            "; CORBA::is_nil(thePOA) = "<<CORBA::is_nil(thePOA));
   if(CORBA::is_nil(thePOA))
 #ifndef WNT
-    myPOA = PortableServer::RefCountServantBase::_default_POA();
+    myPOA = PortableServer::ServantBase::_default_POA();
 #else
-    myPOA = RefCountServantBase::_default_POA();
+    myPOA = ServantBase::_default_POA();
 #endif
   else
     myPOA = PortableServer::POA::_duplicate(thePOA);

diff --git a/src/GenericObj/SALOME_GenericObj_i.hh b/src/GenericObj/SALOME_GenericObj_i.hh
index 8f3cbda1545cda23ea4eb155eb1ce9861d85a027..a183b8cbb50299e20ff25fc7aa9348cdebeacc0d 100644 (file)
--- a/src/GenericObj/SALOME_GenericObj_i.hh
+++ b/src/GenericObj/SALOME_GenericObj_i.hh
@@ -48,7 +48,7 @@
 namespace SALOME{
   class GENERICOBJ_EXPORT GenericObj_i : 
     public virtual POA_SALOME::GenericObj,
-    public virtual PortableServer::RefCountServantBase
+    public virtual PortableServer::ServantBase
   {
   protected:
     PortableServer::POA_var myPOA;

diff --git a/src/Notification/NOTIFICATION_Consumer.cxx b/src/Notification/NOTIFICATION_Consumer.cxx
index c088ee9bec583b9f35cde5f74fcb6035c7f9c135..879f6955863a2cd0d282e2818be7091efbbbabd1 100644 (file)
--- a/src/Notification/NOTIFICATION_Consumer.cxx
+++ b/src/Notification/NOTIFICATION_Consumer.cxx
@@ -93,14 +93,15 @@ bool NOTIFICATION_Consumer::Receive(char** graph, char** node, char** type, char
         };
 
         if (status) {
-            char*        Asender;
-            char*        Agraph;
-            char*        Atype;
-            CORBA::ULong Acounter;
-            CORBA::ULong Astamp;
-            char*        Adate;
-            char*        Anode;
-            char*        Amessage;
+           //omniORB 4.1.x requiries using only CORBA types instead C types
+            const char* Asender;
+            const char* Agraph;
+            const char* Atype;
+            CORBA::ULong      Acounter;
+            CORBA::ULong      Astamp;
+            const char* Adate;
+            const char* Anode;
+            const char* Amessage;          
             event->filterable_data[0].value >>= Asender;
             event->filterable_data[1].value >>= Agraph;
             event->filterable_data[2].value >>= Atype;

diff --git a/src/TestContainer/SALOME_TestComponent_i.cxx b/src/TestContainer/SALOME_TestComponent_i.cxx
index 4e3a497a5a87c23bd92e2335de9c5b4d75c04e53..cb37b782878f7600308ec7f3d8e68f9a47c13fae 100644 (file)
--- a/src/TestContainer/SALOME_TestComponent_i.cxx
+++ b/src/TestContainer/SALOME_TestComponent_i.cxx
@@ -46,7 +46,7 @@ Engines_TestComponent_i::Engines_TestComponent_i(CORBA::ORB_ptr orb,
   MESSAGE("activate object");
   _thisObj = this ;
   _id = _poa->activate_object(_thisObj);
-  SCRUTE(pd_refCount);
+  SCRUTE(_pd_refCount);
 }
 
 Engines_TestComponent_i::Engines_TestComponent_i()
@@ -62,7 +62,7 @@ char* Engines_TestComponent_i::Coucou(CORBA::Long L)
 {
   char s[100];
   sprintf(s, "TestComponent_i : L = %ld", (long) L);
-  SCRUTE(pd_refCount);
+  SCRUTE(_pd_refCount);
 
   return CORBA::string_dup(s);
 }