diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-01 13:26:49 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-01 13:26:49 +0200 |
| commit | d03b7aa31ad95827672208ab363d50666b2762b5 (patch) | |
| tree | 14e4fbf8c75a303dc48f6ce2d4b917bae045cbad /include | |
| parent | 8fcc74e2531f53b6e09584fb58022f852a32b26c (diff) | |
| download | qtlocation-mapboxgl-d03b7aa31ad95827672208ab363d50666b2762b5.tar.gz | |
properly ref/unref the handle and run the loop again for shutdown purposes
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/tile_data.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/util/uv-messenger.h | 1 | ||||
| -rw-r--r-- | include/mbgl/util/uv-worker.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/mbgl/map/tile_data.hpp b/include/mbgl/map/tile_data.hpp index 823523679a..07cf19c5c8 100644 --- a/include/mbgl/map/tile_data.hpp +++ b/include/mbgl/map/tile_data.hpp @@ -41,7 +41,7 @@ public: public: TileData(Tile::ID id, Map &map, const util::ptr<SourceInfo> &source); - virtual ~TileData(); + ~TileData(); void request(); void cancel(); diff --git a/include/mbgl/util/uv-messenger.h b/include/mbgl/util/uv-messenger.h index b082466b60..82b8ef2d9c 100644 --- a/include/mbgl/util/uv-messenger.h +++ b/include/mbgl/util/uv-messenger.h @@ -22,6 +22,7 @@ struct uv_messenger_s { int uv_messenger_init(uv_loop_t *loop, uv_messenger_t *msgr, uv_messenger_cb callback); void uv_messenger_send(uv_messenger_t *msgr, void *arg); void uv_messenger_stop(uv_messenger_t *msgr); +void uv_messenger_ref(uv_messenger_t *msgr); void uv_messenger_unref(uv_messenger_t *msgr); #ifdef __cplusplus diff --git a/include/mbgl/util/uv-worker.h b/include/mbgl/util/uv-worker.h index eff1169a2b..451b6fb04d 100644 --- a/include/mbgl/util/uv-worker.h +++ b/include/mbgl/util/uv-worker.h @@ -27,7 +27,7 @@ struct uv_worker_s { const char *name; int count; uv_worker_close_cb close_cb; - int active; + unsigned int active_items; }; int uv_worker_init(uv_worker_t *worker, uv_loop_t *loop, int count, const char *name); |