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_AttributeFlags.cxx
diff --git
a/src/SALOMEDS/SALOMEDS_AttributeFlags.cxx
b/src/SALOMEDS/SALOMEDS_AttributeFlags.cxx
index 5168f238b16dfe196c7ae98df77175c1e91cb35a..87491025aaa294f4ba05aae1e53557d09c1c7b3d 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_AttributeFlags.cxx
+++ b/
src/SALOMEDS/SALOMEDS_AttributeFlags.cxx
@@
-1,32
+1,33
@@
-// 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
//
// 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_AttributeFlags.cxx
// Author : Sergey RUIN
// Module : SALOME
// File : SALOMEDS_AttributeFlags.cxx
// Author : Sergey RUIN
// Module : SALOME
-
+//
#include "SALOMEDS_AttributeFlags.hxx"
#include "SALOMEDS_AttributeFlags.hxx"
+#include "SALOMEDS.hxx"
-#include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
-
-SALOMEDS_AttributeFlags::SALOMEDS_AttributeFlags(const Handle(SALOMEDSImpl_AttributeFlags)& theAttr)
+SALOMEDS_AttributeFlags::SALOMEDS_AttributeFlags(SALOMEDSImpl_AttributeFlags* theAttr)
:SALOMEDS_GenericAttribute(theAttr)
{}
:SALOMEDS_GenericAttribute(theAttr)
{}
@@
-40,14
+41,20
@@
SALOMEDS_AttributeFlags::~SALOMEDS_AttributeFlags()
int SALOMEDS_AttributeFlags::GetFlags()
{
int aValue;
int SALOMEDS_AttributeFlags::GetFlags()
{
int aValue;
- if(_isLocal) aValue = Handle(SALOMEDSImpl_AttributeFlags)::DownCast(_local_impl)->Get();
+ if (_isLocal) {
+ SALOMEDS::Locker lock;
+ aValue = dynamic_cast<SALOMEDSImpl_AttributeFlags*>(_local_impl)->Get();
+ }
else aValue = SALOMEDS::AttributeFlags::_narrow(_corba_impl)->GetFlags();
return aValue;
}
void SALOMEDS_AttributeFlags::SetFlags(int theFlags)
{
else aValue = SALOMEDS::AttributeFlags::_narrow(_corba_impl)->GetFlags();
return aValue;
}
void SALOMEDS_AttributeFlags::SetFlags(int theFlags)
{
- if(_isLocal) Handle(SALOMEDSImpl_AttributeFlags)::DownCast(_local_impl)->Set(theFlags);
+ if (_isLocal) {
+ SALOMEDS::Locker lock;
+ dynamic_cast<SALOMEDSImpl_AttributeFlags*>(_local_impl)->Set(theFlags);
+ }
else SALOMEDS::AttributeFlags::_narrow(_corba_impl)->SetFlags(theFlags);
}
else SALOMEDS::AttributeFlags::_narrow(_corba_impl)->SetFlags(theFlags);
}
@@
-58,12
+65,13
@@
bool SALOMEDS_AttributeFlags::Get(int theFlag)
void SALOMEDS_AttributeFlags::Set(int theFlag, bool theValue)
{
void SALOMEDS_AttributeFlags::Set(int theFlag, bool theValue)
{
- if(_isLocal) {
- Handle(SALOMEDSImpl_AttributeFlags) anAttr = Handle(SALOMEDSImpl_AttributeFlags)::DownCast(_local_impl);
- if ( theValue )
- anAttr->Set( anAttr->Get() | theFlag );
+ if (_isLocal) {
+ SALOMEDS::Locker lock;
+ SALOMEDSImpl_AttributeFlags* anAttr = dynamic_cast<SALOMEDSImpl_AttributeFlags*>(_local_impl);
+ if (theValue)
+ anAttr->Set(anAttr->Get() | theFlag);
else
else
- anAttr->Set(
anAttr->Get() & ~theFlag
);
+ anAttr->Set(
anAttr->Get() & ~theFlag
);
}
else SALOMEDS::AttributeFlags::_narrow(_corba_impl)->Set(theFlag, theValue);
}
}
else SALOMEDS::AttributeFlags::_narrow(_corba_impl)->Set(theFlag, theValue);
}