summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-02-13 14:50:20 -0800
committerKonstantin Käfer <mail@kkaefer.com>2015-03-06 16:09:14 +0100
commit2075d6bb9a6d6236e3e8f5b3f7f2371c23055c55 (patch)
treeb0856f99e508edfb99483701c87f911247342faf /src
parent025654a101eada83c23178ae39e48a0fe495a6f5 (diff)
downloadqtlocation-mapboxgl-2075d6bb9a6d6236e3e8f5b3f7f2371c23055c55.tar.gz
fix ambiguous name (gcc)
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/util/uv.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/util/uv.cpp b/src/mbgl/util/uv.cpp
index 7de960cc85..d465dfd963 100644
--- a/src/mbgl/util/uv.cpp
+++ b/src/mbgl/util/uv.cpp
@@ -33,11 +33,11 @@ lock::lock(const std::unique_ptr<mutex> &mtx_) : mtx(mtx_.get()) {
lock::~lock() {
if (mtx) { mtx->unlock(); }
}
-lock::lock(lock &&lock) {
- std::swap(mtx, lock.mtx);
+lock::lock(lock &&other) {
+ std::swap(mtx, other.mtx);
}
-lock &lock::operator=(lock &&lock) {
- std::swap(mtx, lock.mtx);
+lock &lock::operator=(lock &&other) {
+ std::swap(mtx, other.mtx);
return *this;
}