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
Merge branch 'V9_7_BR'
[modules/kernel.git]
/
src
/
Basics
/
BasicsGenericDestructor.cxx
diff --git
a/src/Basics/BasicsGenericDestructor.cxx
b/src/Basics/BasicsGenericDestructor.cxx
index dc811ee663ddeff2f7581e6b824173b5626f9c82..7c6b22892ecfeaebf2a9fb86c527d6244a97c90c 100644
(file)
--- a/
src/Basics/BasicsGenericDestructor.cxx
+++ b/
src/Basics/BasicsGenericDestructor.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
1
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
@@
-59,8
+59,7
@@
void PROTECTED_DELETE::deleteInstance(PROTECTED_DELETE *anObject)
return;
else
{
return;
else
{
- int ret;
- ret = pthread_mutex_lock(&_listMutex); // acquire lock, an check again
+ pthread_mutex_lock(&_listMutex); // acquire lock, an check again
if (std::find(_objList.begin(), _objList.end(), anObject)
!= _objList.end())
{
if (std::find(_objList.begin(), _objList.end(), anObject)
!= _objList.end())
{
@@
-69,7
+68,7
@@
void PROTECTED_DELETE::deleteInstance(PROTECTED_DELETE *anObject)
DEVTRACE("PROTECTED_DELETE::deleteInstance2 " << &_objList);
_objList.remove(anObject);
}
DEVTRACE("PROTECTED_DELETE::deleteInstance2 " << &_objList);
_objList.remove(anObject);
}
-
ret =
pthread_mutex_unlock(&_listMutex); // release lock
+ pthread_mutex_unlock(&_listMutex); // release lock
}
}
}
}
@@
-186,7
+185,7
@@
void HouseKeeping( void )
*/
// ============================================================================
*/
// ============================================================================
-
const
int GENERIC_DESTRUCTOR::Add(GENERIC_DESTRUCTOR &anObject)
+int GENERIC_DESTRUCTOR::Add(GENERIC_DESTRUCTOR &anObject)
{
DEVTRACE("GENERIC_DESTRUCTOR::Add("<<typeid(anObject).name()<<") "
<< &anObject);
{
DEVTRACE("GENERIC_DESTRUCTOR::Add("<<typeid(anObject).name()<<") "
<< &anObject);