diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-08-31 14:40:09 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-12-01 11:49:01 +0200 |
| commit | d515f84caf9e1439378f65d7f9e8a88b9809e8ed (patch) | |
| tree | e7f333d590e7240a272b17390d5917716773b120 /src | |
| parent | ff4783847486d414052803ea1a50f6806513967a (diff) | |
| download | qtlocation-mapboxgl-d515f84caf9e1439378f65d7f9e8a88b9809e8ed.tar.gz | |
[core] Remove unused libuv includes
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/sprite/sprite_store.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/style/class_dictionary.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/text/glyph_store.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/util/gl_object_store.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/util/raster.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/util/raster.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/util/time.cpp | 1 |
7 files changed, 6 insertions, 8 deletions
diff --git a/src/mbgl/sprite/sprite_store.cpp b/src/mbgl/sprite/sprite_store.cpp index 8e00229050..f54f3f18fd 100644 --- a/src/mbgl/sprite/sprite_store.cpp +++ b/src/mbgl/sprite/sprite_store.cpp @@ -6,8 +6,8 @@ #include <mbgl/storage/response.hpp> #include <mbgl/util/exception.hpp> #include <mbgl/util/thread_context.hpp> -#include <mbgl/util/run_loop.hpp> +#include <cassert> #include <string> #include <sstream> diff --git a/src/mbgl/style/class_dictionary.cpp b/src/mbgl/style/class_dictionary.cpp index ba7c0d55be..021f791adc 100644 --- a/src/mbgl/style/class_dictionary.cpp +++ b/src/mbgl/style/class_dictionary.cpp @@ -1,14 +1,12 @@ #include <mbgl/style/class_dictionary.hpp> -#include <uv.h> +#include <pthread.h> namespace mbgl { ClassDictionary::ClassDictionary() {} ClassDictionary &ClassDictionary::Get() { - // Note: We should eventually switch to uv_key_* functions, but libuv 0.10 doesn't have these - // yet. Instead, we're using the pthread functions directly for now. static pthread_once_t store_once = PTHREAD_ONCE_INIT; static pthread_key_t store_key; diff --git a/src/mbgl/text/glyph_store.cpp b/src/mbgl/text/glyph_store.cpp index eb770fbf6e..4c9a74b7e9 100644 --- a/src/mbgl/text/glyph_store.cpp +++ b/src/mbgl/text/glyph_store.cpp @@ -3,6 +3,8 @@ #include <mbgl/text/glyph_pbf.hpp> #include <mbgl/util/thread_context.hpp> +#include <cassert> + namespace mbgl { void GlyphStore::requestGlyphRange(const std::string& fontStackName, const GlyphRange& range) { diff --git a/src/mbgl/util/gl_object_store.cpp b/src/mbgl/util/gl_object_store.cpp index 28a36e6639..b4c2582790 100644 --- a/src/mbgl/util/gl_object_store.cpp +++ b/src/mbgl/util/gl_object_store.cpp @@ -4,6 +4,8 @@ #include <mbgl/geometry/vao.hpp> #include <mbgl/platform/gl.hpp> +#include <cassert> + namespace mbgl { namespace util { diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp index c4d65ff320..a4c1d91134 100644 --- a/src/mbgl/util/raster.cpp +++ b/src/mbgl/util/raster.cpp @@ -3,7 +3,6 @@ #include <mbgl/platform/log.hpp> #include <mbgl/util/raster.hpp> -#include <mbgl/util/uv_detail.hpp> #include <cassert> #include <cstring> diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp index 5c65c46e9d..64244135d6 100644 --- a/src/mbgl/util/raster.hpp +++ b/src/mbgl/util/raster.hpp @@ -9,8 +9,6 @@ #include <mutex> -typedef struct uv_loop_s uv_loop_t; - namespace mbgl { class Raster : public std::enable_shared_from_this<Raster> { diff --git a/src/mbgl/util/time.cpp b/src/mbgl/util/time.cpp index 00a3419cca..42d37b6f2c 100644 --- a/src/mbgl/util/time.cpp +++ b/src/mbgl/util/time.cpp @@ -1,5 +1,4 @@ #include <mbgl/util/time.hpp> -#include <mbgl/util/uv_detail.hpp> #include <cstdio> |