Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#18963 Minimize compiler warnings
[modules/kernel.git]
/
src
/
SALOMEDS
/
SALOMEDS_SObject.cxx
diff --git
a/src/SALOMEDS/SALOMEDS_SObject.cxx
b/src/SALOMEDS/SALOMEDS_SObject.cxx
index 6f3332f6b6314f60949f669231ae157572a38bba..3858a9e55954d33701446143b6e12b7d8f16424a 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_SObject.cxx
+++ b/
src/SALOMEDS/SALOMEDS_SObject.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-226,7
+226,7
@@
std::vector<_PTR(GenericAttribute)> SALOMEDS_SObject::GetAllAttributes()
if (_isLocal) {
SALOMEDS::Locker lock;
std::vector<DF_Attribute*> aSeq = _local_impl->GetAllAttributes();
if (_isLocal) {
SALOMEDS::Locker lock;
std::vector<DF_Attribute*> aSeq = _local_impl->GetAllAttributes();
- aLength =
aSeq.size();
+ aLength =
(int)aSeq.size(); //!< TODO: conversion from size_t to int
for (int i = 0; i < aLength; i++) {
anAttr = SALOMEDS_GenericAttribute::CreateAttribute(dynamic_cast<SALOMEDSImpl_GenericAttribute*>(aSeq[i]));
aVector.push_back(_PTR(GenericAttribute)(anAttr));
for (int i = 0; i < aLength; i++) {
anAttr = SALOMEDS_GenericAttribute::CreateAttribute(dynamic_cast<SALOMEDSImpl_GenericAttribute*>(aSeq[i]));
aVector.push_back(_PTR(GenericAttribute)(anAttr));
@@
-289,6
+289,15
@@
int SALOMEDS_SObject::Tag()
return _corba_impl->Tag();
}
return _corba_impl->Tag();
}
+int SALOMEDS_SObject::GetLastChildTag()
+{
+ if (_isLocal) {
+ SALOMEDS::Locker lock;
+ return _local_impl->GetLastChildTag();
+ }
+ return _corba_impl->GetLastChildTag();
+}
+
int SALOMEDS_SObject::Depth()
{
if (_isLocal) {
int SALOMEDS_SObject::Depth()
{
if (_isLocal) {