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 V6_main 13/12/2012
[modules/yacs.git]
/
src
/
SALOMEDS
/
SALOMEDS_AttributeParameter.cxx
diff --git
a/src/SALOMEDS/SALOMEDS_AttributeParameter.cxx
b/src/SALOMEDS/SALOMEDS_AttributeParameter.cxx
index 897ca78337356a1ceb7e11aed0d76e4bd4587098..e6791c23bd5b68b756f4ba01d833a8b9fb2e03b4 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_AttributeParameter.cxx
+++ b/
src/SALOMEDS/SALOMEDS_AttributeParameter.cxx
@@
-1,31
+1,33
@@
-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2012 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
//
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/
or email : webmaster.salome@opencascade.com
//
//
+
// File : SALOMEDS_AttributeParameter.cxx
// Author : Sergey RUIN
// Module : SALOME
// File : SALOMEDS_AttributeParameter.cxx
// Author : Sergey RUIN
// Module : SALOME
-
+//
#include "SALOMEDS_AttributeParameter.hxx"
#include "SALOMEDS.hxx"
#include <string>
#include "SALOMEDS_AttributeParameter.hxx"
#include "SALOMEDS.hxx"
#include <string>
-#include <TCollection_AsciiString.hxx>
//=======================================================================
/*!
//=======================================================================
/*!
@@
-33,7
+35,7
@@
* Purpose : Creates a new instance of SALOMEDS_AttributeParameter
*/
//=======================================================================
* Purpose : Creates a new instance of SALOMEDS_AttributeParameter
*/
//=======================================================================
-SALOMEDS_AttributeParameter::SALOMEDS_AttributeParameter(
const Handle(SALOMEDSImpl_AttributeParameter)&
theAttr)
+SALOMEDS_AttributeParameter::SALOMEDS_AttributeParameter(
SALOMEDSImpl_AttributeParameter*
theAttr)
:SALOMEDS_GenericAttribute(theAttr)
{}
:SALOMEDS_GenericAttribute(theAttr)
{}
@@
-62,13
+64,13
@@
SALOMEDS_AttributeParameter::~SALOMEDS_AttributeParameter()
* Purpose : Associates a integer value with the ID
*/
//=======================================================================
* Purpose : Associates a integer value with the ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetInt(const string& theID, const int theValue)
+void SALOMEDS_AttributeParameter::SetInt(const st
d::st
ring& theID, const int theValue)
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->SetInt(theID, theValue);
+
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->SetInt(theID, theValue);
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->SetInt(theID.c_str(), theValue);
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->SetInt(theID.c_str(), theValue);
@@
-80,12
+82,12
@@
void SALOMEDS_AttributeParameter::SetInt(const string& theID, const int theValue
* Purpose : Returns a int value associated with the given ID
*/
//=======================================================================
* Purpose : Returns a int value associated with the given ID
*/
//=======================================================================
-int SALOMEDS_AttributeParameter::GetInt(const string& theID)
+int SALOMEDS_AttributeParameter::GetInt(const st
d::st
ring& theID)
{
int aValue;
if(_isLocal) {
SALOMEDS::Locker lock;
{
int aValue;
if(_isLocal) {
SALOMEDS::Locker lock;
- aValue =
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->GetInt(theID);
+ aValue =
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->GetInt(theID);
}
else
aValue = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetInt(theID.c_str());
}
else
aValue = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetInt(theID.c_str());
@@
-98,13
+100,13
@@
int SALOMEDS_AttributeParameter::GetInt(const string& theID)
* Purpose : Associates a double value with the ID
*/
//=======================================================================
* Purpose : Associates a double value with the ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetReal(const string& theID, const double& theValue)
+void SALOMEDS_AttributeParameter::SetReal(const st
d::st
ring& theID, const double& theValue)
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->SetReal(theID, theValue);
+
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->SetReal(theID, theValue);
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->SetReal(theID.c_str(), theValue);
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->SetReal(theID.c_str(), theValue);
@@
-116,12
+118,12
@@
void SALOMEDS_AttributeParameter::SetReal(const string& theID, const double& the
* Purpose : Returns a double value associated with the given ID
*/
//=======================================================================
* Purpose : Returns a double value associated with the given ID
*/
//=======================================================================
-double SALOMEDS_AttributeParameter::GetReal(const string& theID)
+double SALOMEDS_AttributeParameter::GetReal(const st
d::st
ring& theID)
{
double aValue;
if(_isLocal) {
SALOMEDS::Locker lock;
{
double aValue;
if(_isLocal) {
SALOMEDS::Locker lock;
- aValue =
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->GetReal(theID);
+ aValue =
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->GetReal(theID);
}
else
aValue = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetReal(theID.c_str());
}
else
aValue = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetReal(theID.c_str());
@@
-134,13
+136,13
@@
double SALOMEDS_AttributeParameter::GetReal(const string& theID)
* Purpose : Associates a string with the ID
*/
//=======================================================================
* Purpose : Associates a string with the ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetString(const st
ring& theID, const
string& theValue)
+void SALOMEDS_AttributeParameter::SetString(const st
d::string& theID, const std::
string& theValue)
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->SetString(theID, theValue);
+
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->SetString(theID, theValue);
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->SetString(theID.c_str(), theValue.c_str());
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->SetString(theID.c_str(), theValue.c_str());
@@
-152,12
+154,12
@@
void SALOMEDS_AttributeParameter::SetString(const string& theID, const string& t
* Purpose : Returns a string associated with the given ID
*/
//=======================================================================
* Purpose : Returns a string associated with the given ID
*/
//=======================================================================
-st
ring SALOMEDS_AttributeParameter::GetString(const
string& theID)
+st
d::string SALOMEDS_AttributeParameter::GetString(const std::
string& theID)
{
{
- string aValue;
+ st
d::st
ring aValue;
if(_isLocal) {
SALOMEDS::Locker lock;
if(_isLocal) {
SALOMEDS::Locker lock;
- aValue =
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->GetString(theID);
+ aValue =
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->GetString(theID);
}
else
aValue = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetString(theID.c_str());
}
else
aValue = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetString(theID.c_str());
@@
-170,13
+172,13
@@
string SALOMEDS_AttributeParameter::GetString(const string& theID)
* Purpose : Associates a bool value with the ID
*/
//=======================================================================
* Purpose : Associates a bool value with the ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetBool(const string& theID, const bool& theValue)
+void SALOMEDS_AttributeParameter::SetBool(const st
d::st
ring& theID, const bool& theValue)
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->SetBool(theID, theValue);
+
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->SetBool(theID, theValue);
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->SetBool(theID.c_str(), theValue);
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->SetBool(theID.c_str(), theValue);
@@
-188,11
+190,11
@@
void SALOMEDS_AttributeParameter::SetBool(const string& theID, const bool& theVa
* Purpose : Returns a bool value associated with the ID
*/
//=======================================================================
* Purpose : Returns a bool value associated with the ID
*/
//=======================================================================
-bool SALOMEDS_AttributeParameter::GetBool(const string& theID)
+bool SALOMEDS_AttributeParameter::GetBool(const st
d::st
ring& theID)
{
if(_isLocal) {
SALOMEDS::Locker lock;
{
if(_isLocal) {
SALOMEDS::Locker lock;
- return
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->GetBool(theID);
+ return
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->GetBool(theID);
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetBool(theID.c_str());
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetBool(theID.c_str());
@@
-204,13
+206,13
@@
bool SALOMEDS_AttributeParameter::GetBool(const string& theID)
* Purpose : Associates an array of double values with the given ID
*/
//=======================================================================
* Purpose : Associates an array of double values with the given ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetRealArray(const st
ring& theID, const
vector<double>& theArray)
+void SALOMEDS_AttributeParameter::SetRealArray(const st
d::string& theID, const std::
vector<double>& theArray)
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->SetRealArray(theID, theArray);
+
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->SetRealArray(theID, theArray);
}
else {
SALOMEDS::DoubleSeq_var aSeq = new SALOMEDS::DoubleSeq;
}
else {
SALOMEDS::DoubleSeq_var aSeq = new SALOMEDS::DoubleSeq;
@@
-229,12
+231,12
@@
void SALOMEDS_AttributeParameter::SetRealArray(const string& theID, const vector
* Purpose : Returns an array of double values associated with the ID
*/
//=======================================================================
* Purpose : Returns an array of double values associated with the ID
*/
//=======================================================================
-
vector<double> SALOMEDS_AttributeParameter::GetRealArray(const
string& theID)
+
std::vector<double> SALOMEDS_AttributeParameter::GetRealArray(const std::
string& theID)
{
{
- vector<double> v;
+
std::
vector<double> v;
if(_isLocal) {
SALOMEDS::Locker lock;
if(_isLocal) {
SALOMEDS::Locker lock;
- return
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->GetRealArray(theID);
+ return
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->GetRealArray(theID);
}
else {
SALOMEDS::DoubleSeq_var aSeq = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetRealArray(theID.c_str());
}
else {
SALOMEDS::DoubleSeq_var aSeq = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetRealArray(theID.c_str());
@@
-253,13
+255,13
@@
vector<double> SALOMEDS_AttributeParameter::GetRealArray(const string& theID)
* Purpose : Associates an array of int values with the given ID
*/
//=======================================================================
* Purpose : Associates an array of int values with the given ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetIntArray(const st
ring& theID, const
vector<int>& theArray)
+void SALOMEDS_AttributeParameter::SetIntArray(const st
d::string& theID, const std::
vector<int>& theArray)
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->SetIntArray(theID, theArray);
+
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->SetIntArray(theID, theArray);
}
else {
SALOMEDS::LongSeq_var aSeq = new SALOMEDS::LongSeq;
}
else {
SALOMEDS::LongSeq_var aSeq = new SALOMEDS::LongSeq;
@@
-278,12
+280,12
@@
void SALOMEDS_AttributeParameter::SetIntArray(const string& theID, const vector<
* Purpose : Returns an array of int values associated with the ID
*/
//=======================================================================
* Purpose : Returns an array of int values associated with the ID
*/
//=======================================================================
-
vector<int> SALOMEDS_AttributeParameter::GetIntArray(const
string& theID)
+
std::vector<int> SALOMEDS_AttributeParameter::GetIntArray(const std::
string& theID)
{
{
- vector<int> v;
+
std::
vector<int> v;
if(_isLocal) {
SALOMEDS::Locker lock;
if(_isLocal) {
SALOMEDS::Locker lock;
- return
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->GetIntArray(theID);
+ return
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->GetIntArray(theID);
}
else {
SALOMEDS::LongSeq_var aSeq = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetIntArray(theID.c_str());
}
else {
SALOMEDS::LongSeq_var aSeq = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetIntArray(theID.c_str());
@@
-302,13
+304,13
@@
vector<int> SALOMEDS_AttributeParameter::GetIntArray(const string& theID)
* Purpose : Associates an array of string values with the given ID
*/
//=======================================================================
* Purpose : Associates an array of string values with the given ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetStrArray(const st
ring& theID, const vector<
string>& theArray)
+void SALOMEDS_AttributeParameter::SetStrArray(const st
d::string& theID, const std::vector<std::
string>& theArray)
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->SetStrArray(theID, theArray);
+
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->SetStrArray(theID, theArray);
}
else {
SALOMEDS::StringSeq_var aSeq = new SALOMEDS::StringSeq;
}
else {
SALOMEDS::StringSeq_var aSeq = new SALOMEDS::StringSeq;
@@
-327,19
+329,19
@@
void SALOMEDS_AttributeParameter::SetStrArray(const string& theID, const vector<
* Purpose : Returns an array of string values associated with the ID
*/
//=======================================================================
* Purpose : Returns an array of string values associated with the ID
*/
//=======================================================================
-
vector<string> SALOMEDS_AttributeParameter::GetStrArray(const
string& theID)
+
std::vector<std::string> SALOMEDS_AttributeParameter::GetStrArray(const std::
string& theID)
{
{
-
vector<
string> v;
+
std::vector<std::
string> v;
if(_isLocal) {
SALOMEDS::Locker lock;
if(_isLocal) {
SALOMEDS::Locker lock;
- return
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->GetStrArray(theID);
+ return
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->GetStrArray(theID);
}
else {
SALOMEDS::StringSeq_var aSeq = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetStrArray(theID.c_str());
int length = aSeq->length();
if(length) {
v.resize(length);
}
else {
SALOMEDS::StringSeq_var aSeq = SALOMEDS::AttributeParameter::_narrow(_corba_impl)->GetStrArray(theID.c_str());
int length = aSeq->length();
if(length) {
v.resize(length);
- for(int i = 0; i < length; i++) v[i] = string(aSeq[i].in());
+ for(int i = 0; i < length; i++) v[i] = st
d::st
ring(aSeq[i].in());
}
}
return v;
}
}
return v;
@@
-353,11
+355,11
@@
vector<string> SALOMEDS_AttributeParameter::GetStrArray(const string& theID)
* a value in the attribute
*/
//=======================================================================
* a value in the attribute
*/
//=======================================================================
-bool SALOMEDS_AttributeParameter::IsSet(const string& theID, const int theType)
+bool SALOMEDS_AttributeParameter::IsSet(const st
d::st
ring& theID, const int theType)
{
if(_isLocal) {
SALOMEDS::Locker lock;
{
if(_isLocal) {
SALOMEDS::Locker lock;
- return
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->IsSet(theID, (Parameter_Types)theType);
+ return
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->IsSet(theID, (Parameter_Types)theType);
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->IsSet(theID.c_str(), theType);
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->IsSet(theID.c_str(), theType);
@@
-369,13
+371,13
@@
bool SALOMEDS_AttributeParameter::IsSet(const string& theID, const int theType)
* Purpose : Removes a parameter with given ID
*/
//=======================================================================
* Purpose : Removes a parameter with given ID
*/
//=======================================================================
-bool SALOMEDS_AttributeParameter::RemoveID(const string& theID, const int theType)
+bool SALOMEDS_AttributeParameter::RemoveID(const st
d::st
ring& theID, const int theType)
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
{
CheckLocked();
if(_isLocal) {
SALOMEDS::Locker lock;
- return
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->RemoveID(theID, (Parameter_Types)theType);
+ return
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->RemoveID(theID, (Parameter_Types)theType);
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->RemoveID(theID.c_str(), theType);
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->RemoveID(theID.c_str(), theType);
@@
-392,8
+394,8
@@
_PTR(AttributeParameter) SALOMEDS_AttributeParameter::GetFather()
SALOMEDSClient_AttributeParameter* AP = NULL;
if(_isLocal) {
SALOMEDS::Locker lock;
SALOMEDSClient_AttributeParameter* AP = NULL;
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter) AP_impl = Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->GetFather();
- if(
AP_impl.IsNull()
) return _PTR(AttributeParameter)(AP);
+
SALOMEDSImpl_AttributeParameter* AP_impl = dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->GetFather();
+ if(
!AP_impl
) return _PTR(AttributeParameter)(AP);
AP = new SALOMEDS_AttributeParameter(AP_impl);
}
else {
AP = new SALOMEDS_AttributeParameter(AP_impl);
}
else {
@@
-415,7
+417,7
@@
bool SALOMEDS_AttributeParameter::HasFather()
{
if(_isLocal) {
SALOMEDS::Locker lock;
{
if(_isLocal) {
SALOMEDS::Locker lock;
- return
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->HasFather();
+ return
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->HasFather();
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->HasFather();
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->HasFather();
@@
-431,7
+433,7
@@
bool SALOMEDS_AttributeParameter::IsRoot()
{
if(_isLocal) {
SALOMEDS::Locker lock;
{
if(_isLocal) {
SALOMEDS::Locker lock;
- return
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->IsRoot();
+ return
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->IsRoot();
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->IsRoot();
}
else
return SALOMEDS::AttributeParameter::_narrow(_corba_impl)->IsRoot();
@@
-447,7
+449,7
@@
void SALOMEDS_AttributeParameter::Clear()
{
if(_isLocal) {
SALOMEDS::Locker lock;
{
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl)->Clear();
+
dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl)->Clear();
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->Clear();
}
else
SALOMEDS::AttributeParameter::_narrow(_corba_impl)->Clear();
@@
-459,12
+461,12
@@
void SALOMEDS_AttributeParameter::Clear()
* Purpose : Returns an array of all ID's of the given type
*/
//=======================================================================
* Purpose : Returns an array of all ID's of the given type
*/
//=======================================================================
-
vector<
string> SALOMEDS_AttributeParameter::GetIDs(const int theType)
+
std::vector<std::
string> SALOMEDS_AttributeParameter::GetIDs(const int theType)
{
{
-
vector<
string> v;
+
std::vector<std::
string> v;
if(_isLocal) {
SALOMEDS::Locker lock;
if(_isLocal) {
SALOMEDS::Locker lock;
-
Handle(SALOMEDSImpl_AttributeParameter) AP_impl = Handle(SALOMEDSImpl_AttributeParameter)::DownCast
(_local_impl);
+
SALOMEDSImpl_AttributeParameter* AP_impl = dynamic_cast<SALOMEDSImpl_AttributeParameter*>
(_local_impl);
return AP_impl->GetIDs((Parameter_Types)theType);
}
else {
return AP_impl->GetIDs((Parameter_Types)theType);
}
else {
@@
-473,7
+475,7
@@
vector<string> SALOMEDS_AttributeParameter::GetIDs(const int theType)
int length = CorbaSeq->length();
if(length) {
v.resize(length);
int length = CorbaSeq->length();
if(length) {
v.resize(length);
- for(int i = 0; i <length; i++) v[i] = string(CorbaSeq[i].in());
+ for(int i = 0; i <length; i++) v[i] = st
d::st
ring(CorbaSeq[i].in());
}
}
}
}