Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	include/mbgl/storage/base_request.hpp
	include/mbgl/storage/file_request_baton.hpp
	include/mbgl/storage/http_request.hpp
	include/mbgl/storage/http_request_baton.hpp
	include/mbgl/util/uv_detail.hpp
	platform/darwin/http_request_baton_cocoa.mm
	platform/default/caching_http_file_source.cpp
	platform/default/http_request_baton_curl.cpp
	src/map/map.cpp
	src/storage/base_request.cpp
	src/storage/file_request.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/storage/http_request_baton.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/include/mbgl/platform/default/caching_http_file_source.hpp b/include/mbgl/platform/default/caching_http_file_source.hpp
index 058bdc7c3e..c394474881 100644
--- a/include/mbgl/platform/default/caching_http_file_source.hpp
+++ b/include/mbgl/platform/default/caching_http_file_source.hpp
@@ -3,6 +3,7 @@
 
 #include <mbgl/storage/file_source.hpp>
 
+#include <thread>
 #include <unordered_map>
 
 typedef struct uv_messenger_s uv_messenger_t;
@@ -14,7 +15,6 @@ class SQLiteStore;
 
 class CachingHTTPFileSource : public FileSource {
 public:
-    CachingHTTPFileSource(uv_loop_t*, const std::string &path_);
     CachingHTTPFileSource(const std::string &path_);
     ~CachingHTTPFileSource();
 
@@ -33,7 +33,7 @@ public:
     void retryAllPending();
 
 private:
-    unsigned long thread_id;
+    std::thread::id thread_id;
 
     // Path to the cache database.
     std::string path;