From a0e72e4b0828ab7867d5a76e5fee66ce69f14b23 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 16 Apr 2018 12:02:40 +0200 Subject: [PATCH] Rename variable to unhide class field with same name. --- src/kernel/activity/ConditionVariableImpl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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(); } -- 2.20.1