diff options
Diffstat (limited to 'node_modules/nan/nan.h')
-rw-r--r-- | node_modules/nan/nan.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/node_modules/nan/nan.h b/node_modules/nan/nan.h index 514115d..648e6e2 100644 --- a/node_modules/nan/nan.h +++ b/node_modules/nan/nan.h @@ -13,7 +13,7 @@ * * MIT License <https://github.com/nodejs/nan/blob/master/LICENSE.md> * - * Version 2.14.0: current Node 12.2.0, Node 12: 0.12.18, Node 10: 0.10.48, iojs: 3.3.1 + * Version 2.14.1: current Node 14.0.0, Node 0.12: 0.12.18, Node 0.10: 0.10.48, iojs: 3.3.1 * * See https://github.com/nodejs/nan for the latest update to this file **********************************************************************************/ @@ -39,6 +39,8 @@ #define NODE_10_0_MODULE_VERSION 64 #define NODE_11_0_MODULE_VERSION 67 #define NODE_12_0_MODULE_VERSION 72 +#define NODE_13_0_MODULE_VERSION 79 +#define NODE_14_0_MODULE_VERSION 83 #ifdef _MSC_VER # define NAN_HAS_CPLUSPLUS_11 (_MSC_VER >= 1800) @@ -2141,10 +2143,7 @@ class AsyncProgressWorkerBase : public AsyncBareProgressWorker<T> { private: void SendProgress_(const T *data, size_t count) { T *new_data = new T[count]; - { - T *it = new_data; - std::copy(data, data + count, it); - } + std::copy(data, data + count, new_data); uv_mutex_lock(&this->async_lock); T *old_data = asyncdata_; @@ -2263,10 +2262,7 @@ class AsyncProgressQueueWorker : public AsyncBareProgressQueueWorker<T> { private: void SendProgress_(const T *data, size_t count) { T *new_data = new T[count]; - { - T *it = new_data; - std::copy(data, data + count, it); - } + std::copy(data, data + count, new_data); uv_mutex_lock(&async_lock); asyncdata_.push(std::pair<T*, size_t>(new_data, count)); @@ -2474,9 +2470,10 @@ template <typename T, template <typename> class HandleType> inline void SetMethod( HandleType<T> recv , const char *name - , FunctionCallback callback) { + , FunctionCallback callback + , v8::Local<v8::Value> data = v8::Local<v8::Value>()) { HandleScope scope; - v8::Local<v8::FunctionTemplate> t = New<v8::FunctionTemplate>(callback); + v8::Local<v8::FunctionTemplate> t = New<v8::FunctionTemplate>(callback, data); v8::Local<v8::String> fn_name = New(name).ToLocalChecked(); t->SetClassName(fn_name); // Note(@agnat): Pass an empty T* as discriminator. See note on @@ -2486,11 +2483,13 @@ inline void SetMethod( inline void SetPrototypeMethod( v8::Local<v8::FunctionTemplate> recv - , const char* name, FunctionCallback callback) { + , const char* name + , FunctionCallback callback + , v8::Local<v8::Value> data = v8::Local<v8::Value>()) { HandleScope scope; v8::Local<v8::FunctionTemplate> t = New<v8::FunctionTemplate>( callback - , v8::Local<v8::Value>() + , data , New<v8::Signature>(recv)); v8::Local<v8::String> fn_name = New(name).ToLocalChecked(); recv->PrototypeTemplate()->Set(fn_name, t); @@ -2812,7 +2811,7 @@ struct Tap { t_.Reset(To<v8::Object>(t).ToLocalChecked()); } - ~Tap() { t_.Reset(); } // not sure if neccessary + ~Tap() { t_.Reset(); } // not sure if necessary inline void plan(int i) { HandleScope scope; |