X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasics%2FBasicsGenericDestructor.cxx;h=7c6b22892ecfeaebf2a9fb86c527d6244a97c90c;hb=7b6895b48ccd982f69db4fe3ecd30d75be0514dc;hp=4984ca0004429d0fddac78949b2ae3eb40a28eb8;hpb=34bdd08c1cbba32e415e32489d56f91cf89e76da;p=modules%2Fkernel.git diff --git a/src/Basics/BasicsGenericDestructor.cxx b/src/Basics/BasicsGenericDestructor.cxx index 4984ca000..7c6b22892 100644 --- a/src/Basics/BasicsGenericDestructor.cxx +++ b/src/Basics/BasicsGenericDestructor.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 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 @@ -59,8 +59,7 @@ void PROTECTED_DELETE::deleteInstance(PROTECTED_DELETE *anObject) 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()) { @@ -69,7 +68,7 @@ void PROTECTED_DELETE::deleteInstance(PROTECTED_DELETE *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("<push_back(&anObject); - return Destructors->size(); + return (int)Destructors->size(); }