diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-11-26 13:23:47 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-11-26 19:40:36 +0200 |
| commit | 873eabcf28e60ee8649d92a9c975904ec69cd222 (patch) | |
| tree | edb0c36516417c64f7c7314ee574c934de7a3794 /platform | |
| parent | 1d33790dc06a1127e55753d123d55e6ec6e89713 (diff) | |
| download | qtlocation-mapboxgl-873eabcf28e60ee8649d92a9c975904ec69cd222.tar.gz | |
[node] Fix build on GCC 4.9.2
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/node/src/node_log.hpp | 1 | ||||
| -rw-r--r-- | platform/node/src/node_map.cpp | 8 | ||||
| -rw-r--r-- | platform/node/src/node_map.hpp | 1 | ||||
| -rw-r--r-- | platform/node/src/node_mapbox_gl_native.cpp | 1 | ||||
| -rw-r--r-- | platform/node/src/node_request.hpp | 1 |
5 files changed, 4 insertions, 8 deletions
diff --git a/platform/node/src/node_log.hpp b/platform/node/src/node_log.hpp index 8798016d7a..d29e4e28e0 100644 --- a/platform/node/src/node_log.hpp +++ b/platform/node/src/node_log.hpp @@ -5,7 +5,6 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" -#pragma GCC diagnostic ignored "-Wnested-anon-types" #include <nan.h> #pragma GCC diagnostic pop diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index d4c551d666..d9ff63f720 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -405,8 +405,8 @@ void NodeMap::release() { valid = false; - uv_close(reinterpret_cast<uv_handle_t *>(async), [] (uv_handle_t *handle) { - delete reinterpret_cast<uv_async_t *>(handle); + uv_close(reinterpret_cast<uv_handle_t *>(async), [] (uv_handle_t *h) { + delete reinterpret_cast<uv_async_t *>(h); }); map.reset(nullptr); @@ -433,8 +433,8 @@ NodeMap::NodeMap(v8::Local<v8::Object> options) : async(new uv_async_t) { async->data = this; - uv_async_init(uv_default_loop(), async, [](UV_ASYNC_PARAMS(handle)) { - reinterpret_cast<NodeMap *>(handle->data)->renderFinished(); + uv_async_init(uv_default_loop(), async, [](UV_ASYNC_PARAMS(h)) { + reinterpret_cast<NodeMap *>(h->data)->renderFinished(); }); // Make sure the async handle doesn't keep the loop alive. diff --git a/platform/node/src/node_map.hpp b/platform/node/src/node_map.hpp index 23cd3c9fab..2c1cbd2545 100644 --- a/platform/node/src/node_map.hpp +++ b/platform/node/src/node_map.hpp @@ -7,7 +7,6 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" -#pragma GCC diagnostic ignored "-Wnested-anon-types" #include <nan.h> #pragma GCC diagnostic pop diff --git a/platform/node/src/node_mapbox_gl_native.cpp b/platform/node/src/node_mapbox_gl_native.cpp index 76c522d83e..4a86a8d855 100644 --- a/platform/node/src/node_mapbox_gl_native.cpp +++ b/platform/node/src/node_mapbox_gl_native.cpp @@ -1,7 +1,6 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" -#pragma GCC diagnostic ignored "-Wnested-anon-types" #include <node.h> #include <nan.h> #pragma GCC diagnostic pop diff --git a/platform/node/src/node_request.hpp b/platform/node/src/node_request.hpp index 3a06a7b62f..8e57cb30ec 100644 --- a/platform/node/src/node_request.hpp +++ b/platform/node/src/node_request.hpp @@ -3,7 +3,6 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wshadow" -#pragma GCC diagnostic ignored "-Wnested-anon-types" #include <nan.h> #pragma GCC diagnostic pop |