summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Glöckner <cgloeckner@freenet.de>2016-03-31 10:22:19 +0200
committerChristian Glöckner <cgloeckner@freenet.de>2016-03-31 10:22:19 +0200
commit3539ba7cb47aedf8433d91890dbbc59a9ca1a201 (patch)
tree5e5968e55ff8adfb5fd3bc38883ee37f9dda2862 /src
parent6489719f4bf6f1f65af706986d3878c6fb3080b4 (diff)
Fixed my dumb fail
Diffstat (limited to 'src')
-rw-r--r--src/syncedsettings.h6
1 files changed, 3 insertions, 3 deletions
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<std::mutex> lock{mutex};
- std::lock_guard<std::mutex> lock{other.mutex};
+ std::lock_guard<std::mutex> lock2{other.mutex};
data = other.data;
}
return *this;
@@ -104,8 +104,8 @@ public:
if (*this != &other)
{
std::lock_guard<std::mutex> lock{mutex};
- std::lock_guard<std::mutex> lock{other.mutex};
- std::swap(data, tmp.data);
+ std::lock_guard<std::mutex> lock2{other.mutex};
+ std::swap(data, other.data);
}
return *this;
}