diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-04 08:02:57 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-04 08:02:57 +1100 |
| commit | 991a74774e1e835ff2277b3997d60f09245593dd (patch) | |
| tree | f881149caec5f1e1a55a4e9900548f8a5e92bf0b /include/mbgl/map | |
| parent | 58833dd56a29d14afb7b40d8484328941d3d5020 (diff) | |
| parent | 21b4f8c501d67ed8ecf6dedbdd55064a5c8f823c (diff) | |
| download | qtlocation-mapboxgl-991a74774e1e835ff2277b3997d60f09245593dd.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
gyp/mbgl-ios.gypi
gyp/mbgl-linux.gypi
gyp/mbgl-osx.gypi
platform/default/caching_http_file_source.cpp
Diffstat (limited to 'include/mbgl/map')
| -rw-r--r-- | include/mbgl/map/map.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 2f81a2bd81..f222036bfa 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -34,7 +34,7 @@ class Map : private util::noncopyable { typedef void (*stop_callback)(void *); public: - explicit Map(View &view); + explicit Map(View&, FileSource&); ~Map(); // Start the map render thread. It is asynchronous. @@ -197,7 +197,7 @@ private: Transform transform; TransformState state; - util::ptr<FileSource> fileSource; + FileSource& fileSource; util::ptr<Style> style; GlyphAtlas glyphAtlas; |