From 3539ba7cb47aedf8433d91890dbbc59a9ca1a201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Thu, 31 Mar 2016 10:22:19 +0200 Subject: Fixed my dumb fail --- src/syncedsettings.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/syncedsettings.h b/src/syncedsettings.h index 4991627..b72229e 100644 --- a/src/syncedsettings.h +++ b/src/syncedsettings.h @@ -93,7 +93,7 @@ public: if (*this != &other) { std::lock_guard lock{mutex}; - std::lock_guard lock{other.mutex}; + std::lock_guard lock2{other.mutex}; data = other.data; } return *this; @@ -104,8 +104,8 @@ public: if (*this != &other) { std::lock_guard lock{mutex}; - std::lock_guard lock{other.mutex}; - std::swap(data, tmp.data); + std::lock_guard lock2{other.mutex}; + std::swap(data, other.data); } return *this; } -- cgit v1.2.3