diff options
| author | Christian Glöckner <cgloeckner@freenet.de> | 2016-03-31 10:22:19 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-03-31 21:15:44 +0200 |
| commit | 28aec48039c6837f14848580b9a386d9d87de21d (patch) | |
| tree | 3b1f9d5ec457d8774aa95bb736efaa77f4bffda1 /src/syncedsettings.h | |
| parent | dd49e09e4a96635638ad674a337f8f95928ae277 (diff) | |
Fixed my dumb fail
Diffstat (limited to 'src/syncedsettings.h')
| -rw-r--r-- | src/syncedsettings.h | 6 |
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; } |