summaryrefslogtreecommitdiff
path: root/test/util
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-03-23 17:31:14 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-03-24 10:54:32 -0700
commit169755e89a72b103fab100ccd101013e8eef1481 (patch)
tree5716e13519fe2b7f5c91cccbdbf14635a1ef117d /test/util
parent7ff074889e826f766028ba582beb677b39d16bec (diff)
downloadqtlocation-mapboxgl-169755e89a72b103fab100ccd101013e8eef1481.tar.gz
[core] Unify FileRequest and WorkRequest
Diffstat (limited to 'test/util')
-rw-r--r--test/util/async_task.cpp2
-rw-r--r--test/util/thread.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/util/async_task.cpp b/test/util/async_task.cpp
index 95cf160548..4a80b5f3d9 100644
--- a/test/util/async_task.cpp
+++ b/test/util/async_task.cpp
@@ -105,7 +105,7 @@ TEST(AsyncTask, ThreadSafety) {
};
std::vector<std::unique_ptr<Thread<TestWorker>>> threads;
- std::vector<std::unique_ptr<mbgl::WorkRequest>> requests;
+ std::vector<std::unique_ptr<mbgl::AsyncRequest>> requests;
ThreadContext context = {"Test", ThreadType::Map, ThreadPriority::Regular};
for (unsigned i = 0; i < numThreads; ++i) {
diff --git a/test/util/thread.cpp b/test/util/thread.cpp
index 40e4d8ede4..9414d14f3c 100644
--- a/test/util/thread.cpp
+++ b/test/util/thread.cpp
@@ -67,7 +67,7 @@ TEST(Thread, invoke) {
const std::thread::id tid = std::this_thread::get_id();
RunLoop loop;
- std::vector<std::unique_ptr<mbgl::WorkRequest>> requests;
+ std::vector<std::unique_ptr<mbgl::AsyncRequest>> requests;
loop.invoke([&] {
EXPECT_EQ(tid, std::this_thread::get_id());
@@ -123,7 +123,7 @@ TEST(Thread, context) {
const std::thread::id tid = std::this_thread::get_id();
RunLoop loop;
- std::vector<std::unique_ptr<mbgl::WorkRequest>> requests;
+ std::vector<std::unique_ptr<mbgl::AsyncRequest>> requests;
loop.invoke([&] {
Thread<TestObject> thread({"Test", ThreadType::Worker, ThreadPriority::Low}, tid);