From ec1b4c43fd711b7f4f924a21e8428868d7a5f78d Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Wed, 1 Jul 2015 08:48:11 +0300
Subject: Do not force uv_loop_t as the first parameter for a threaded object
 ctor

---
 test/style/mock_file_source.cpp | 4 ++--
 test/style/resource_loading.cpp | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'test/style')

diff --git a/test/style/mock_file_source.cpp b/test/style/mock_file_source.cpp
index 6aa735d0ea..6f368bde52 100644
--- a/test/style/mock_file_source.cpp
+++ b/test/style/mock_file_source.cpp
@@ -17,8 +17,8 @@ namespace mbgl {
 
 class MockFileSource::Impl {
 public:
-    Impl(uv_loop_t* loop, Type type, const std::string& match)
-        : type_(type), match_(match), timer_(loop) {
+    Impl(Type type, const std::string& match)
+        : type_(type), match_(match), timer_(util::RunLoop::getLoop()) {
         timer_.start(timeout, timeout, [this] { dispatchPendingRequests(); });
         timer_.unref();
     }
diff --git a/test/style/resource_loading.cpp b/test/style/resource_loading.cpp
index f65c9c1f97..fc8905f7bb 100644
--- a/test/style/resource_loading.cpp
+++ b/test/style/resource_loading.cpp
@@ -20,8 +20,7 @@ namespace {
 
 class MockMapContext : public Style::Observer {
 public:
-    MockMapContext(uv_loop_t* loop,
-                   View& view,
+    MockMapContext(View& view,
                    FileSource& fileSource,
                    const std::function<void(std::exception_ptr error)>& callback)
         : data_(MapMode::Still),
@@ -33,7 +32,7 @@ public:
         transform_.setLatLngZoom({0, 0}, 16);
 
         const std::string style = util::read_file("test/fixtures/resources/style.json");
-        style_ = std::make_unique<Style>(style, "", loop),
+        style_ = std::make_unique<Style>(style, "", util::RunLoop::getLoop());
         style_->setObserver(this);
     }
 
-- 
cgit v1.2.1