From: Martin Quinson Date: Sat, 16 Jun 2018 20:39:31 +0000 (+0200) Subject: snake_case s4u::Mutex X-Git-Tag: v3.20~95 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/12783570914b603d99b5ffff1c92517592d07e62 snake_case s4u::Mutex --- diff --git a/examples/s4u/mutex/s4u-mutex.cpp b/examples/s4u/mutex/s4u-mutex.cpp index d3dd4f4d38..ae2ca42912 100644 --- a/examples/s4u/mutex/s4u-mutex.cpp +++ b/examples/s4u/mutex/s4u-mutex.cpp @@ -44,7 +44,7 @@ static void workerLockGuard(simgrid::s4u::MutexPtr mutex, int& result) static void master() { int result = 0; - simgrid::s4u::MutexPtr mutex = simgrid::s4u::Mutex::createMutex(); + simgrid::s4u::MutexPtr mutex = simgrid::s4u::Mutex::create(); for (int i = 0; i < NB_ACTOR * 2 ; i++) { // To create a worker use the static method simgrid::s4u::Actor. diff --git a/include/simgrid/s4u/Mutex.hpp b/include/simgrid/s4u/Mutex.hpp index 4230a984ed..b30de03c12 100644 --- a/include/simgrid/s4u/Mutex.hpp +++ b/include/simgrid/s4u/Mutex.hpp @@ -48,11 +48,14 @@ public: Mutex& operator=(Mutex const&) = delete; /** Constructs a new mutex */ - static Ptr createMutex(); + static Ptr create(); void lock(); void unlock(); bool try_lock(); + + // deprecated + XBT_ATTRIB_DEPRECATED_v323("Please use Mutex::create()") static Ptr createMutex() { return create(); } }; using MutexPtr = Mutex::Ptr; diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp index f9bc89211a..f8ecb27df4 100644 --- a/src/s4u/s4u_Mutex.cpp +++ b/src/s4u/s4u_Mutex.cpp @@ -34,7 +34,7 @@ bool Mutex::try_lock() * * See @ref s4u_raii. */ -MutexPtr Mutex::createMutex() +MutexPtr Mutex::create() { smx_mutex_t mutex = simcall_mutex_init(); return MutexPtr(&mutex->mutex(), false);