PR: mergefrom_PAL_OCC_21Oct04

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

diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx
index 151a0bb9ca5d4625130fcf982a4e4d4cdfc6160a..ba6d6397e5a3609b9dfc7f129a0b190cce8f47c3 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx
@@ -8,6 +8,7 @@
 //  Author : Yves FRICAUD
 //  Module : SALOME
 
+using namespace std;
 #include "SALOMEDS_UseCaseBuilder_i.hxx"
 #include "SALOMEDS_AttributeComment_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
@@ -23,7 +24,6 @@
 #include <TDataStd_ChildNodeIterator.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_ChildIterator.hxx>
-using namespace std;
 
 #define USE_CASE_LABEL_TAG           2
 #define USE_CASE_GUID                "AA43BB12-D9CD-11d6-945D-0050DA506788"
@@ -272,7 +272,7 @@ CORBA::Boolean SALOMEDS_UseCaseBuilder_i::SetName(const char* theName) {
   if(_root.IsNull()) return 0;
 
   Handle(TDataStd_Name) aNameAttrib;
-  TCollection_ExtendedString aName(strdup(theName));
+  TCollection_ExtendedString aName((char*)theName);
 
   if (!_root->FindAttribute(TDataStd_Name::GetID(), aNameAttrib))
     aNameAttrib = TDataStd_Name::Set(_root->Label(), aName);
@@ -315,7 +315,7 @@ char* SALOMEDS_UseCaseBuilder_i::GetName() {
 
   Handle(TDataStd_Name) aName;
   if (!_root->FindAttribute(TDataStd_Name::GetID(), aName)) return aString._retn();
-  aString = strdup(TCollection_AsciiString(aName->Get()).ToCString());
+  aString = CORBA::string_dup(TCollection_AsciiString(aName->Get()).ToCString());
   return aString._retn();
 }
 
@@ -368,7 +368,7 @@ SALOMEDS::SObject_ptr SALOMEDS_UseCaseBuilder_i::AddUseCase(const char* theName)
   TDF_Label aChild = aLabel.FindChild(anInteger->Get());
   aNode = TDataStd_TreeNode::Set(aChild, aBasicGUID);
   aFatherNode->Append(aNode);
-  TDataStd_Name::Set(aChild, TCollection_ExtendedString(strdup(theName)));
+  TDataStd_Name::Set(aChild, TCollection_ExtendedString((char*)theName));
 
   SALOMEDS_SObject_i *  so_servant = new SALOMEDS_SObject_i (aChild, _orb);
   SALOMEDS::SObject_var so = SALOMEDS::SObject::_narrow(so_servant->_this());