Rename Engines::Component to Engines::EngineComponent

[modules/kernel.git] / src / SALOMEDS / SALOMEDS_GenericAttribute.cxx

diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx b/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
index 827ea4714474cbb21c99e98181344c12908dd326..2f9ad0777b56c8bdbaf3ce74f9e3b60d74927b40 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SALOMEDS_GenericAttribute.cxx
 //  Author : Sergey RUIN
 //  Module : SALOME
@@ -40,8 +41,6 @@
 #include <unistd.h>
 #endif
 
-using namespace std; 
-
 SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(SALOMEDSImpl_GenericAttribute* theGA)
 {
   _isLocal = true;
@@ -99,7 +98,7 @@ std::string SALOMEDS_GenericAttribute::Type()
     aType = _local_impl->Type();
   }
   else {
-    aType = _corba_impl->Type();
+    aType = (CORBA::String_var)_corba_impl->Type();
   }
   return aType;
 }
@@ -112,7 +111,7 @@ std::string SALOMEDS_GenericAttribute::GetClassType()
     aType = _local_impl->GetClassType();
   }
   else {
-    aType = _corba_impl->GetClassType();
+    aType = (CORBA::String_var)_corba_impl->GetClassType();
   }
   return aType;
 }
@@ -125,7 +124,7 @@ _PTR(SObject) SALOMEDS_GenericAttribute::GetSObject()
     aSO = new SALOMEDS_SObject(_local_impl->GetSObject());
   }
   else {
-    aSO = new SALOMEDS_SObject(_corba_impl->GetSObject());
+    aSO = new SALOMEDS_SObject((SALOMEDS::SObject_var)_corba_impl->GetSObject());
   }
 
   return _PTR(SObject)(aSO);
@@ -148,7 +147,8 @@ SALOMEDS_GenericAttribute* SALOMEDS_GenericAttribute::CreateAttribute(SALOMEDS::
 {
   SALOMEDS_GenericAttribute* aGA = NULL;
   if(!CORBA::is_nil(theGA)) {
-      std::string aTypeOfAttribute = theGA->GetClassType();
+      CORBA::String_var astr=theGA->GetClassType();
+      std::string aTypeOfAttribute = astr.in();
       __CreateGenericClientAttributeCORBA
   }
   return aGA;