summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/storage/default_file_source.hpp2
-rw-r--r--include/mbgl/storage/file_source.hpp10
-rw-r--r--include/mbgl/storage/online_file_source.hpp2
-rw-r--r--include/mbgl/util/async_request.hpp12
-rw-r--r--include/mbgl/util/run_loop.hpp4
-rw-r--r--include/mbgl/util/work_request.hpp6
6 files changed, 22 insertions, 14 deletions
diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp
index dd67cff9b8..76d60fce70 100644
--- a/include/mbgl/storage/default_file_source.hpp
+++ b/include/mbgl/storage/default_file_source.hpp
@@ -30,7 +30,7 @@ public:
void setAccessToken(const std::string&);
std::string getAccessToken() const;
- std::unique_ptr<FileRequest> request(const Resource&, Callback) override;
+ std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override;
/*
* Retrieve all regions in the offline database.
diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp
index 8d08315cd9..e572776af2 100644
--- a/include/mbgl/storage/file_source.hpp
+++ b/include/mbgl/storage/file_source.hpp
@@ -5,17 +5,13 @@
#include <mbgl/storage/resource.hpp>
#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/async_request.hpp>
#include <functional>
#include <memory>
namespace mbgl {
-class FileRequest : private util::noncopyable {
-public:
- virtual ~FileRequest() = default;
-};
-
class FileSource : private util::noncopyable {
public:
virtual ~FileSource() = default;
@@ -24,10 +20,10 @@ public:
// Request a resource. The callback will be called asynchronously, in the same
// thread as the request was made. This thread must have an active RunLoop. The
- // request may be cancelled before completion by releasing the returned FileRequest.
+ // request may be cancelled before completion by releasing the returned AsyncRequest.
// If the request is cancelled before the callback is executed, the callback will
// not be executed.
- virtual std::unique_ptr<FileRequest> request(const Resource&, Callback) = 0;
+ virtual std::unique_ptr<AsyncRequest> request(const Resource&, Callback) = 0;
};
} // namespace mbgl
diff --git a/include/mbgl/storage/online_file_source.hpp b/include/mbgl/storage/online_file_source.hpp
index aceb141fb4..b52dce35f0 100644
--- a/include/mbgl/storage/online_file_source.hpp
+++ b/include/mbgl/storage/online_file_source.hpp
@@ -17,7 +17,7 @@ public:
void setAccessToken(const std::string& t) { accessToken = t; }
std::string getAccessToken() const { return accessToken; }
- std::unique_ptr<FileRequest> request(const Resource&, Callback) override;
+ std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override;
private:
friend class OnlineFileRequestImpl;
diff --git a/include/mbgl/util/async_request.hpp b/include/mbgl/util/async_request.hpp
new file mode 100644
index 0000000000..9e85094966
--- /dev/null
+++ b/include/mbgl/util/async_request.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <mbgl/util/noncopyable.hpp>
+
+namespace mbgl {
+
+class AsyncRequest : private util::noncopyable {
+public:
+ virtual ~AsyncRequest() = default;
+};
+
+} // namespace mbgl
diff --git a/include/mbgl/util/run_loop.hpp b/include/mbgl/util/run_loop.hpp
index fbc4794940..4e25caf554 100644
--- a/include/mbgl/util/run_loop.hpp
+++ b/include/mbgl/util/run_loop.hpp
@@ -58,7 +58,7 @@ public:
// Post the cancellable work fn(args...) to this RunLoop.
template <class Fn, class... Args>
- std::unique_ptr<WorkRequest>
+ std::unique_ptr<AsyncRequest>
invokeCancellable(Fn&& fn, Args&&... args) {
auto flag = std::make_shared<std::atomic<bool>>();
*flag = false;
@@ -76,7 +76,7 @@ public:
// Invoke fn(args...) on this RunLoop, then invoke callback(results...) on the current RunLoop.
template <class Fn, class Cb, class... Args>
- std::unique_ptr<WorkRequest>
+ std::unique_ptr<AsyncRequest>
invokeWithCallback(Fn&& fn, Cb&& callback, Args&&... args) {
auto flag = std::make_shared<std::atomic<bool>>();
*flag = false;
diff --git a/include/mbgl/util/work_request.hpp b/include/mbgl/util/work_request.hpp
index bd1d97ee70..f24e4b2e9f 100644
--- a/include/mbgl/util/work_request.hpp
+++ b/include/mbgl/util/work_request.hpp
@@ -1,7 +1,7 @@
#ifndef MBGL_UTIL_WORK_REQUEST
#define MBGL_UTIL_WORK_REQUEST
-#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/async_request.hpp>
#include <memory>
@@ -9,11 +9,11 @@ namespace mbgl {
class WorkTask;
-class WorkRequest : public util::noncopyable {
+class WorkRequest : public AsyncRequest {
public:
using Task = std::shared_ptr<WorkTask>;
WorkRequest(Task);
- ~WorkRequest();
+ ~WorkRequest() override;
private:
std::shared_ptr<WorkTask> task;