diff options
author | Leith Bade <leith@mapbox.com> | 2014-12-04 23:21:23 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-12-04 23:21:23 +1100 |
commit | 20584a57ddcbcd80e1d5e2fd3bd60162055da6cb (patch) | |
tree | 94dfaa14eddaf3d5558a002af893f793ac9853bb /src | |
parent | 1c0396690e9eba8e588f5553790ba8407dd55f34 (diff) | |
download | qtlocation-mapboxgl-20584a57ddcbcd80e1d5e2fd3bd60162055da6cb.tar.gz |
Fix debug build
Diffstat (limited to 'src')
-rw-r--r-- | src/map/map.cpp | 4 | ||||
-rw-r--r-- | src/storage/file_request_baton.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index 7e16f9ba7c..89d84b48f0 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -240,7 +240,7 @@ void Map::stop(stop_callback cb, void *data) { } void Map::pause(bool waitForPause) { - assert(uv_thread_self() == mainThread); + assert(std::this_thread::get_id() == mainThread); assert(async); mutexRun.lock(); pausing = true; @@ -258,7 +258,7 @@ void Map::pause(bool waitForPause) { } void Map::resume() { - assert(uv_thread_self() == mainThread); + assert(std::this_thread::get_id() == mainThread); assert(async); mutexRun.lock(); diff --git a/src/storage/file_request_baton.cpp b/src/storage/file_request_baton.cpp index 632e0f3fd2..c661cd347a 100644 --- a/src/storage/file_request_baton.cpp +++ b/src/storage/file_request_baton.cpp @@ -136,7 +136,7 @@ void FileRequestBaton::file_read(uv_fs_t *req) { } void FileRequestBaton::file_closed(uv_fs_t *req) { - assert(std::this_thread::get_id() == reinterpret_cast<FileRequestBaton *>(req->data)->thread_id); + assert(std::this_thread::get_id() == reinterpret_cast<FileRequestBaton *>(req->data)->threadId); if (req->result < 0) { // Closing the file failed. But there isn't anything we can do. |