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

Conflicts:
	.gitignore
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	include/mbgl/map/map.hpp
	src/mbgl/map/map.cpp
	src/mbgl/storage/caching_http_file_source.cpp

4 files changed, 4 insertions, 56 deletions

diff --git a/include/mbgl/platform/default/caching_http_file_source.hpp b/include/mbgl/platform/default/caching_http_file_source.hpp
deleted file mode 100644
index 1db95c699d..0000000000
--- a/include/mbgl/platform/default/caching_http_file_source.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef MBGL_STORAGE_CACHING_HTTP_FILE_SOURCE
-#define MBGL_STORAGE_CACHING_HTTP_FILE_SOURCE
-
-#include <mbgl/storage/file_source.hpp>
-
-#include <thread>
-#include <unordered_map>
-
-typedef struct uv_messenger_s uv_messenger_t;
-
-namespace mbgl {
-
-class BaseRequest;
-class SQLiteStore;
-
-class CachingHTTPFileSource : public FileSource {
-public:
-    CachingHTTPFileSource(const std::string &path_);
-    ~CachingHTTPFileSource();
-
-    // Stores and checks the libuv loop for requests
-    void setLoop(uv_loop_t*);
-    bool hasLoop();
-
-    // Stores and retrieves the base path/URL for relative requests
-    void setBase(const std::string &value);
-    const std::string &getBase() const;
-
-    std::unique_ptr<Request> request(ResourceType type, const std::string &url);
-
-    void prepare(std::function<void()> fn);
-
-    void retryAllPending();
-
-private:
-    std::thread::id threadId;
-
-    // Path to the cache database.
-    std::string path;
-
-    // Stores a URL that is used as a base for loading resources with relative path.
-    std::string base;
-
-    std::unordered_map<std::string, std::weak_ptr<BaseRequest>> pending;
-    util::ptr<SQLiteStore> store;
-    uv_loop_t *loop = nullptr;
-    uv_messenger_t *queue = nullptr;
-};
-
-}
-
-#endif
diff --git a/include/mbgl/platform/default/headless_display.hpp b/include/mbgl/platform/default/headless_display.hpp
index 5b33fd6990..08c423c587 100644
--- a/include/mbgl/platform/default/headless_display.hpp
+++ b/include/mbgl/platform/default/headless_display.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_COMMON_HEADLESS_DISPLAY
 #define MBGL_COMMON_HEADLESS_DISPLAY
 
-#include "headless_view.hpp"
+#include <mbgl/platform/default/headless_view.hpp>
 
 namespace mbgl {
 
diff --git a/include/mbgl/platform/gl.hpp b/include/mbgl/platform/gl.hpp
index ee781018ce..53386626a0 100644
--- a/include/mbgl/platform/gl.hpp
+++ b/include/mbgl/platform/gl.hpp
@@ -140,9 +140,9 @@ extern bool isDepth24Supported;
 // static int indent = 0;
 inline void start_group(const std::string &str) {
     if (gl::PushDebugGroup != nullptr) {
-        gl::PushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, str.size(), str.c_str());
+        gl::PushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, GLsizei(str.size()), str.c_str());
     } else if (gl::PushGroupMarkerEXT != nullptr) {
-        gl::PushGroupMarkerEXT(str.size(), str.c_str());
+        gl::PushGroupMarkerEXT(GLsizei(str.size()), str.c_str());
     }
     // fprintf(stderr, "%s%s\n", std::string(indent * 4, ' ').c_str(), str.c_str());
     // indent++;
diff --git a/include/mbgl/platform/log.hpp b/include/mbgl/platform/log.hpp
index 418160d3ee..b95895fd10 100644
--- a/include/mbgl/platform/log.hpp
+++ b/include/mbgl/platform/log.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_PLATFORM_LOG
 #define MBGL_PLATFORM_LOG
 
-#include "event.hpp"
+#include <mbgl/platform/event.hpp>
 
 #include <mbgl/util/std.hpp>