From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 16 Apr 2018 10:02:40 +0000 (+0200)
Subject: Rename variable to unhide class field with same name.
X-Git-Tag: v3.20~418^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a0e72e4b0828ab7867d5a76e5fee66ce69f14b23

Rename variable to unhide class field with same name.
---

diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp
index b08e892107..70308cd08f 100644
--- a/src/kernel/activity/ConditionVariableImpl.cpp
+++ b/src/kernel/activity/ConditionVariableImpl.cpp
@@ -108,14 +108,14 @@ void ConditionVariableImpl::signal()
 
     /* Now transform the cond wait simcall into a mutex lock one */
     smx_simcall_t simcall = &proc.simcall;
-    smx_mutex_t mutex;
+    smx_mutex_t simcall_mutex;
     if (simcall->call == SIMCALL_COND_WAIT)
-      mutex = simcall_cond_wait__get__mutex(simcall);
+      simcall_mutex = simcall_cond_wait__get__mutex(simcall);
     else
-      mutex = simcall_cond_wait_timeout__get__mutex(simcall);
+      simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall);
     simcall->call = SIMCALL_MUTEX_LOCK;
 
-    simcall_HANDLER_mutex_lock(simcall, mutex);
+    simcall_HANDLER_mutex_lock(simcall, simcall_mutex);
   }
   XBT_OUT();
 }