Salome HOME
projects
/
modules
/
yacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V7_siman 11/10/2013
[modules/yacs.git]
/
src
/
SALOMEDS
/
SALOMEDS_GenericAttribute.cxx
diff --git
a/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
b/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
index b0666a4d2a6990e7ea5df4556f76313a237645f8..466f95ed1e7582cafad9941bd43cd00c92bd295f 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
+++ b/
src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
@@
-1,28
+1,29
@@
-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2013 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
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
+// License as published by the Free Software Foundation; either
// version 2.1 of the License.
// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//
+// This library is distributed in the hope that it will be useful
,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
+// You should have received a copy of the GNU Lesser General Public
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// File : SALOMEDS_GenericAttribute.cxx
// Author : Sergey RUIN
// Module : SALOME
// File : SALOMEDS_GenericAttribute.cxx
// Author : Sergey RUIN
// Module : SALOME
-
-
-
+//
#include <string>
#include "SALOMEDS_GenericAttribute.hxx"
#include <string>
#include "SALOMEDS_GenericAttribute.hxx"
@@
-31,6
+32,8
@@
#include "SALOMEDS_ClientAttributes.hxx"
#include "SALOMEDS.hxx"
#include "SALOMEDS_ClientAttributes.hxx"
#include "SALOMEDS.hxx"
+#include "Basics_Utils.hxx"
+
#ifdef WIN32
#include <process.h>
#else
#ifdef WIN32
#include <process.h>
#else
@@
-38,10
+41,6
@@
#include <unistd.h>
#endif
#include <unistd.h>
#endif
-#include "OpUtil.hxx"
-
-using namespace std;
-
SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(SALOMEDSImpl_GenericAttribute* theGA)
{
_isLocal = true;
SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(SALOMEDSImpl_GenericAttribute* theGA)
{
_isLocal = true;
@@
-57,9
+56,9
@@
SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(SALOMEDS::GenericAttribute_
long pid = (long)getpid();
#endif
long pid = (long)getpid();
#endif
- CORBA::LongLong addr = theGA->GetLocalImpl(GetHostname().c_str(), pid, _isLocal);
+ CORBA::LongLong addr = theGA->GetLocalImpl(
Kernel_Utils::
GetHostname().c_str(), pid, _isLocal);
if(_isLocal) {
if(_isLocal) {
- _local_impl =
((SALOMEDSImpl_GenericAttribute*)(addr)
);
+ _local_impl =
reinterpret_cast<SALOMEDSImpl_GenericAttribute*>(addr
);
_corba_impl = SALOMEDS::GenericAttribute::_nil();
}
else {
_corba_impl = SALOMEDS::GenericAttribute::_nil();
}
else {
@@
-71,7
+70,7
@@
SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(SALOMEDS::GenericAttribute_
SALOMEDS_GenericAttribute::~SALOMEDS_GenericAttribute()
{
if (!_isLocal) {
SALOMEDS_GenericAttribute::~SALOMEDS_GenericAttribute()
{
if (!_isLocal) {
- _corba_impl->
Destroy
();
+ _corba_impl->
UnRegister
();
}
}
}
}
@@
-99,7
+98,7
@@
std::string SALOMEDS_GenericAttribute::Type()
aType = _local_impl->Type();
}
else {
aType = _local_impl->Type();
}
else {
- aType = _corba_impl->Type();
+ aType =
(CORBA::String_var)
_corba_impl->Type();
}
return aType;
}
}
return aType;
}
@@
-112,7
+111,7
@@
std::string SALOMEDS_GenericAttribute::GetClassType()
aType = _local_impl->GetClassType();
}
else {
aType = _local_impl->GetClassType();
}
else {
- aType = _corba_impl->GetClassType();
+ aType =
(CORBA::String_var)
_corba_impl->GetClassType();
}
return aType;
}
}
return aType;
}
@@
-125,7
+124,7
@@
_PTR(SObject) SALOMEDS_GenericAttribute::GetSObject()
aSO = new SALOMEDS_SObject(_local_impl->GetSObject());
}
else {
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);
}
return _PTR(SObject)(aSO);
@@
-148,7
+147,8
@@
SALOMEDS_GenericAttribute* SALOMEDS_GenericAttribute::CreateAttribute(SALOMEDS::
{
SALOMEDS_GenericAttribute* aGA = NULL;
if(!CORBA::is_nil(theGA)) {
{
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;
__CreateGenericClientAttributeCORBA
}
return aGA;