summaryrefslogtreecommitdiff
path: root/src/mbgl/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/util')
-rw-r--r--src/mbgl/util/thread.hpp2
-rw-r--r--src/mbgl/util/work_queue.cpp2
-rw-r--r--src/mbgl/util/work_queue.hpp4
-rw-r--r--src/mbgl/util/worker.cpp8
-rw-r--r--src/mbgl/util/worker.hpp4
5 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/util/thread.hpp b/src/mbgl/util/thread.hpp
index d05748a003..33ca5aba6b 100644
--- a/src/mbgl/util/thread.hpp
+++ b/src/mbgl/util/thread.hpp
@@ -37,7 +37,7 @@ public:
// Invoke object->fn(args...) in the runloop thread, then invoke callback(result) in the current thread.
template <typename Fn, class Cb, class... Args>
- std::unique_ptr<WorkRequest>
+ std::unique_ptr<AsyncRequest>
invokeWithCallback(Fn fn, Cb&& callback, Args&&... args) {
return loop->invokeWithCallback(bind(fn), callback, std::forward<Args>(args)...);
}
diff --git a/src/mbgl/util/work_queue.cpp b/src/mbgl/util/work_queue.cpp
index 80c4af8778..d0033e3ca2 100644
--- a/src/mbgl/util/work_queue.cpp
+++ b/src/mbgl/util/work_queue.cpp
@@ -12,7 +12,7 @@ WorkQueue::WorkQueue() : runLoop(RunLoop::Get()) {
WorkQueue::~WorkQueue() {
assert(runLoop == RunLoop::Get());
- // Cancel all pending WorkRequests.
+ // Cancel all pending AsyncRequests.
while (!queue.empty()) {
queue.pop();
}
diff --git a/src/mbgl/util/work_queue.hpp b/src/mbgl/util/work_queue.hpp
index 6694352918..788cfb4d2d 100644
--- a/src/mbgl/util/work_queue.hpp
+++ b/src/mbgl/util/work_queue.hpp
@@ -2,7 +2,7 @@
#define MBGL_UTIL_WORK_QUEUE
#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/work_request.hpp>
+#include <mbgl/util/async_request.hpp>
#include <functional>
#include <memory>
@@ -31,7 +31,7 @@ public:
private:
void pop(const std::function<void()>&);
- std::queue<std::unique_ptr<WorkRequest>> queue;
+ std::queue<std::unique_ptr<AsyncRequest>> queue;
std::mutex queueMutex;
RunLoop* runLoop;
diff --git a/src/mbgl/util/worker.cpp b/src/mbgl/util/worker.cpp
index bc6e4be3db..ec9d02573d 100644
--- a/src/mbgl/util/worker.cpp
+++ b/src/mbgl/util/worker.cpp
@@ -68,7 +68,7 @@ Worker::Worker(std::size_t count) {
Worker::~Worker() = default;
-std::unique_ptr<WorkRequest>
+std::unique_ptr<AsyncRequest>
Worker::parseRasterTile(std::unique_ptr<RasterBucket> bucket,
const std::shared_ptr<const std::string> data,
std::function<void(RasterTileParseResult)> callback) {
@@ -77,7 +77,7 @@ Worker::parseRasterTile(std::unique_ptr<RasterBucket> bucket,
data);
}
-std::unique_ptr<WorkRequest>
+std::unique_ptr<AsyncRequest>
Worker::parseGeometryTile(TileWorker& worker,
std::vector<std::unique_ptr<StyleLayer>> layers,
std::unique_ptr<GeometryTile> tile,
@@ -88,7 +88,7 @@ Worker::parseGeometryTile(TileWorker& worker,
std::move(layers), std::move(tile), config);
}
-std::unique_ptr<WorkRequest>
+std::unique_ptr<AsyncRequest>
Worker::parsePendingGeometryTileLayers(TileWorker& worker,
PlacementConfig config,
std::function<void(TileParseResult)> callback) {
@@ -97,7 +97,7 @@ Worker::parsePendingGeometryTileLayers(TileWorker& worker,
callback, &worker, config);
}
-std::unique_ptr<WorkRequest>
+std::unique_ptr<AsyncRequest>
Worker::redoPlacement(TileWorker& worker,
const std::unordered_map<std::string, std::unique_ptr<Bucket>>& buckets,
PlacementConfig config,
diff --git a/src/mbgl/util/worker.hpp b/src/mbgl/util/worker.hpp
index 96a7b27885..6630465631 100644
--- a/src/mbgl/util/worker.hpp
+++ b/src/mbgl/util/worker.hpp
@@ -10,7 +10,7 @@
namespace mbgl {
-class WorkRequest;
+class AsyncRequest;
class RasterBucket;
class GeometryTileLoader;
@@ -33,7 +33,7 @@ public:
// bind references to itself, and if and when those lambdas execute, the references
// will still be valid.
- using Request = std::unique_ptr<WorkRequest>;
+ using Request = std::unique_ptr<AsyncRequest>;
Request parseRasterTile(std::unique_ptr<RasterBucket> bucket,
std::shared_ptr<const std::string> data,