summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Schüßler <v.schuessler@gmail.com>2014-11-22 19:55:07 +0100
committerLeith Bade <leith@mapbox.com>2014-11-28 00:16:06 +1100
commit49519ba7f3c7cfbf863c30419c2e35fa5d3ceeee (patch)
treec1b84b7f333737ce8cb68381e83ef495f151680e
parent10d7781766d7d2556db7c8a42d9c3bcf89da0a22 (diff)
downloadqtlocation-mapboxgl-49519ba7f3c7cfbf863c30419c2e35fa5d3ceeee.tar.gz
Fix member shadowing warnings
-rw-r--r--include/mbgl/util/uv_detail.hpp4
-rw-r--r--src/storage/http_request.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/util/uv_detail.hpp b/include/mbgl/util/uv_detail.hpp
index 112339c1b5..b3cafa3fd4 100644
--- a/include/mbgl/util/uv_detail.hpp
+++ b/include/mbgl/util/uv_detail.hpp
@@ -147,8 +147,8 @@ public:
uv_worker_init(w, loop, count, name);
}
inline ~worker() {
- uv_worker_close(w, [](uv_worker_t *worker) {
- delete worker;
+ uv_worker_close(w, [](uv_worker_t *worker_) {
+ delete worker_;
});
}
inline void add(void *data, uv_worker_cb work_cb, uv_worker_after_cb after_work_cb) {
diff --git a/src/storage/http_request.cpp b/src/storage/http_request.cpp
index bce74649a7..f19436e234 100644
--- a/src/storage/http_request.cpp
+++ b/src/storage/http_request.cpp
@@ -39,12 +39,12 @@ void HTTPRequest::startCacheRequest() {
cache_baton->request = this;
cache_baton->path = path;
cache_baton->store = store;
- store->get(path, [](std::unique_ptr<Response> &&response, void *ptr) {
+ store->get(path, [](std::unique_ptr<Response> &&response_, void *ptr) {
// Wrap in a unique_ptr, so it'll always get auto-destructed.
std::unique_ptr<CacheRequestBaton> baton((CacheRequestBaton *)ptr);
if (baton->request) {
baton->request->cache_baton = nullptr;
- baton->request->handleCacheResponse(std::move(response));
+ baton->request->handleCacheResponse(std::move(response_));
}
}, cache_baton);
}