tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Leith Bade
2014-12-18 20:35:55 +11:00
parent 465ae587a2
commit 1dd3ad8e64
8 changed files with 209 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platform/default/asset_request_libuv.cpp
View File

@@ -30,16 +30,8 @@ struct AssetRequestBaton {
uv_buf_t buffer;
};
void AssetRequestBaton::run(AssetRequestBaton *ptr) {
assert(std::this_thread::get_id() == ptr->threadId);
if (ptr->canceled || !ptr->request) {
// Either the AssetRequest object has been destructed, or the
// request was canceled.
cleanup(ptr);
return;
}
AssetRequestBaton::AssetRequestBaton(AssetRequest *request_, const std::string &path, uv_loop_t *loop)
: threadId(std::this_thread::get_id()), request(request_) {
req.data = this;
uv_fs_open(loop, &req, path.c_str(), O_RDONLY, S_IRUSR, fileOpened);
}
@@ -56,17 +48,11 @@ void AssetRequestBaton::cancel() {
uv_cancel((uv_req_t *)&req);
}
void AssetRequestBaton::run(AssetRequestBaton *ptr) {
void AssetRequestBaton::notifyError(uv_fs_t *req) {
AssetRequestBaton *ptr = reinterpret_cast<AssetRequestBaton *>(req->data);
assert(std::this_thread::get_id() == ptr->threadId);
if (ptr->canceled || !ptr->request) {
// Either the AssetRequest object has been destructed, or the
// request was canceled.
cleanup(ptr);
return;
}
rf (ptr->request && req->result < 0 && !ptr->canceled && req->result != UV_ECANCELED) {
if (ptr->request && req->result < 0 && !ptr->canceled && req->result != UV_ECANCELED) {
ptr->request->response = util::make_unique<Response>();
ptr->request->response->code = req->result == UV_ENOENT ? 404 : 500;
#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10