diff --git a/include/mbgl/util/uv_detail.hpp b/include/mbgl/util/uv_detail.hpp index 112339c1b..b3cafa3fd 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 bce74649a..f19436e23 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, void *ptr) { + store->get(path, [](std::unique_ptr &&response_, void *ptr) { // Wrap in a unique_ptr, so it'll always get auto-destructed. std::unique_ptr 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); }