summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-02-11 17:38:07 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-02-11 18:01:53 -0800
commitc2ab5b34a76599f2493e5b9101c870cf1c91253d (patch)
treed014efb918ea5f65307007497d93be6ef09ab833
parent62bbf2627a32a57188e4026aca8dc337e07ded7f (diff)
downloadqtlocation-mapboxgl-c2ab5b34a76599f2493e5b9101c870cf1c91253d.tar.gz
[tests] Fix build
-rw-r--r--platform/default/mbgl/storage/offline.cpp2
-rw-r--r--src/mbgl/tile/tile_cache.hpp1
-rw-r--r--test/storage/offline.cpp2
-rw-r--r--test/style/comparisons.cpp2
-rw-r--r--test/style/source.cpp2
-rw-r--r--test/util/clip_ids.cpp2
6 files changed, 6 insertions, 5 deletions
diff --git a/platform/default/mbgl/storage/offline.cpp b/platform/default/mbgl/storage/offline.cpp
index 7311474bcf..931e079771 100644
--- a/platform/default/mbgl/storage/offline.cpp
+++ b/platform/default/mbgl/storage/offline.cpp
@@ -1,6 +1,6 @@
#include <mbgl/storage/offline.hpp>
#include <mbgl/util/tile_cover.hpp>
-#include <mbgl/map/source_info.hpp>
+#include <mbgl/source/source_info.hpp>
#include <rapidjson/document.h>
#include <rapidjson/stringbuffer.h>
diff --git a/src/mbgl/tile/tile_cache.hpp b/src/mbgl/tile/tile_cache.hpp
index 199f611e79..4d0b42242a 100644
--- a/src/mbgl/tile/tile_cache.hpp
+++ b/src/mbgl/tile/tile_cache.hpp
@@ -2,6 +2,7 @@
#define MBGL_MAP_TILE_CACHE
#include <list>
+#include <memory>
#include <unordered_map>
namespace mbgl {
diff --git a/test/storage/offline.cpp b/test/storage/offline.cpp
index b34aa02c22..e8f78425f5 100644
--- a/test/storage/offline.cpp
+++ b/test/storage/offline.cpp
@@ -1,5 +1,5 @@
#include <mbgl/storage/offline.hpp>
-#include <mbgl/map/source_info.hpp>
+#include <mbgl/source/source_info.hpp>
#include <mbgl/map/tile_id.hpp>
#include <gtest/gtest.h>
diff --git a/test/style/comparisons.cpp b/test/style/comparisons.cpp
index dc2d74bf11..88f2645be8 100644
--- a/test/style/comparisons.cpp
+++ b/test/style/comparisons.cpp
@@ -1,7 +1,7 @@
#include <iostream>
#include "../fixtures/util.hpp"
-#include <mbgl/map/vector_tile.hpp>
+#include <mbgl/tile/vector_tile.hpp>
#include <mbgl/style/filter_expression.hpp>
#include <mbgl/style/filter_expression_private.hpp>
diff --git a/test/style/source.cpp b/test/style/source.cpp
index f5b46292ab..9b3857fc07 100644
--- a/test/style/source.cpp
+++ b/test/style/source.cpp
@@ -3,7 +3,7 @@
#include "../fixtures/mock_view.hpp"
#include "../fixtures/stub_style_observer.hpp"
-#include <mbgl/map/source.hpp>
+#include <mbgl/source/source.hpp>
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/string.hpp>
#include <mbgl/util/io.hpp>
diff --git a/test/util/clip_ids.cpp b/test/util/clip_ids.cpp
index f61e7b1e2d..fb7616d8ff 100644
--- a/test/util/clip_ids.cpp
+++ b/test/util/clip_ids.cpp
@@ -4,7 +4,7 @@
#include <algorithm>
#include <mbgl/util/clip_id.hpp>
-#include <mbgl/map/tile.hpp>
+#include <mbgl/tile/tile.hpp>
using namespace mbgl;