From 92a7f73bbe10f817d5c2d607ba07fc69b859593b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Thu, 22 Jan 2015 07:02:14 -0800 Subject: fixes for linux --- src/mbgl/storage/default_file_source.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp index 05d87e474b..60633c789e 100644 --- a/src/mbgl/storage/default_file_source.cpp +++ b/src/mbgl/storage/default_file_source.cpp @@ -96,28 +96,28 @@ SharedRequestBase *DefaultFileSource::find(const Resource &resource) { } Request *DefaultFileSource::request(const Resource &resource, uv_loop_t *l, Callback callback) { - auto request = new Request(resource, l, std::move(callback)); + auto req = new Request(resource, l, std::move(callback)); // This function can be called from any thread. Make sure we're executing the actual call in the // file source loop by sending it over the queue. It will be processed in processAction(). - queue->send(AddRequestAction{ request }); - return request; + queue->send(AddRequestAction{ req }); + return req; } void DefaultFileSource::request(const Resource &resource, Callback callback) { - auto request = new Request(resource, nullptr, std::move(callback)); + auto req = new Request(resource, nullptr, std::move(callback)); // This function can be called from any thread. Make sure we're executing the actual call in the // file source loop by sending it over the queue. It will be processed in processAction(). - queue->send(AddRequestAction{ request }); + queue->send(AddRequestAction{ req }); } -void DefaultFileSource::cancel(Request *request) { - request->cancel(); +void DefaultFileSource::cancel(Request *req) { + req->cancel(); // This function can be called from any thread. Make sure we're executing the actual call in the // file source loop by sending it over the queue. It will be processed in processAction(). - queue->send(RemoveRequestAction{ request }); + queue->send(RemoveRequestAction{ req }); } void DefaultFileSource::process(AddRequestAction &action) { -- cgit v1.2.1