Fixes problems associated with node 10 and NAN (#14847)
* Fixes problems associated with node 10 and NAN * Follow up removal of unnecessary linking to map object * Remove header left over from debugging
This commit is contained in:
@@ -11,18 +11,19 @@
|
||||
|
||||
namespace node_mbgl {
|
||||
|
||||
class NodeMap;
|
||||
class NodeRequest;
|
||||
|
||||
struct NodeAsyncRequest : public mbgl::AsyncRequest {
|
||||
NodeAsyncRequest();
|
||||
~NodeAsyncRequest() override;
|
||||
NodeRequest* request;
|
||||
};
|
||||
|
||||
class NodeRequest : public Nan::ObjectWrap {
|
||||
|
||||
class NodeRequest : public Nan::ObjectWrap,
|
||||
public Nan::AsyncWorker {
|
||||
public:
|
||||
struct NodeAsyncRequest : public mbgl::AsyncRequest {
|
||||
NodeAsyncRequest(NodeRequest*);
|
||||
~NodeAsyncRequest() override;
|
||||
NodeRequest* request;
|
||||
};
|
||||
|
||||
NodeRequest(NodeMap*, mbgl::FileSource::Callback);
|
||||
NodeRequest(mbgl::FileSource::Callback, NodeAsyncRequest*);
|
||||
~NodeRequest();
|
||||
|
||||
static Nan::Persistent<v8::Function> constructor;
|
||||
@@ -32,12 +33,11 @@ public:
|
||||
static void New(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
static void HandleCallback(const Nan::FunctionCallbackInfo<v8::Value>&);
|
||||
|
||||
void Execute();
|
||||
void unref();
|
||||
|
||||
private:
|
||||
NodeMap* target;
|
||||
mbgl::FileSource::Callback callback;
|
||||
NodeAsyncRequest* asyncRequest = nullptr;
|
||||
NodeAsyncRequest* asyncRequest;
|
||||
Nan::AsyncResource* asyncResource = new Nan::AsyncResource("mbgl:execute");
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user