tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix member shadowing warnings

Browse Source
This commit is contained in:
Vincent Schüßler
2014-11-22 19:55:07 +01:00
committed by Leith Bade
parent 10d7781766
commit 49519ba7f3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbgl/util/uv_detail.hpp
View File

@@ -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) {

4
src/storage/http_request.cpp
View File

@@ -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);
}