diff options
author | Leith Bade <leith@mapbox.com> | 2014-12-04 22:39:38 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-12-04 22:39:38 +1100 |
commit | 1c0396690e9eba8e588f5553790ba8407dd55f34 (patch) | |
tree | 2a730307f1483b7bc0a193df11276e611c5b856b /platform/android | |
parent | 8f1754cf0a7054dd1f6b16260eb99a2afd739f43 (diff) | |
download | qtlocation-mapboxgl-1c0396690e9eba8e588f5553790ba8407dd55f34.tar.gz |
Fixup after merge
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/asset_request_baton_libzip.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/platform/android/asset_request_baton_libzip.cpp b/platform/android/asset_request_baton_libzip.cpp index 7fc86ae1be..205c42bf4c 100644 --- a/platform/android/asset_request_baton_libzip.cpp +++ b/platform/android/asset_request_baton_libzip.cpp @@ -9,12 +9,11 @@ // See https://code.google.com/p/android/issues/detail?id=72349 // After this is fixed change usage errno to std::errno #include <zip.h> -#include <uv.h> namespace mbgl { void AssetRequestBaton::run(AssetRequestBaton *ptr) { - assert(uv_thread_self() == ptr->threadId); + assert(std::this_thread::get_id() == ptr->threadId); if (ptr->canceled || !ptr->request) { // Either the AssetRequest object has been destructed, or the |