electron
/
addon-tools-el
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix type conflict

This commit is contained in:
Luis Blanco 2019-09-05 15:43:52 +03:00
parent 99322630f5
commit 1e1edf7611
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/addon-tools.hpp
View File

@ -504,9 +504,9 @@ inline void inheritEs5(napi_env env, Napi::Function ctor, Napi::Function superCt
} }
typedef Napi::Value (*StaticMethodCallback)(const Napi::CallbackInfo& info); typedef Napi::Value (*Es5MethodCallback)(const Napi::CallbackInfo& info);
typedef Napi::Value (*StaticGetterCallback)(const Napi::CallbackInfo& info); typedef Napi::Value (*Es5GetterCallback)(const Napi::CallbackInfo& info);
typedef void (*StaticSetterCallback)(const Napi::CallbackInfo& info); typedef void (*Es5SetterCallback)(const Napi::CallbackInfo& info);
#define DECLARE_ES5_CLASS(CLASS, NAME) \ #define DECLARE_ES5_CLASS(CLASS, NAME) \
@ -547,7 +547,7 @@ typedef void (*StaticSetterCallback)(const Napi::CallbackInfo& info);
}; \ }; \
inline static void method( \ inline static void method( \
const char *name, \ const char *name, \
StaticMethodCallback cb \ Es5MethodCallback cb \
) { \ ) { \
Napi::Function proto = _ctorEs5.Value().Get("prototype").As<Napi::Function>(); \ Napi::Function proto = _ctorEs5.Value().Get("prototype").As<Napi::Function>(); \
proto.DefineProperty( \ proto.DefineProperty( \
@ -556,7 +556,7 @@ typedef void (*StaticSetterCallback)(const Napi::CallbackInfo& info);
}; \ }; \
inline static void accessorR( \ inline static void accessorR( \
const char *name, \ const char *name, \
StaticGetterCallback getter \ Es5GetterCallback getter \
) { \ ) { \
Napi::Function proto = _ctorEs5.Value().Get("prototype").As<Napi::Function>(); \ Napi::Function proto = _ctorEs5.Value().Get("prototype").As<Napi::Function>(); \
proto.DefineProperty( \ proto.DefineProperty( \
@ -565,8 +565,8 @@ typedef void (*StaticSetterCallback)(const Napi::CallbackInfo& info);
}; \ }; \
inline static void accessorRw( \ inline static void accessorRw( \
const char *name, \ const char *name, \
StaticGetterCallback getter, \ Es5GetterCallback getter, \
StaticSetterCallback setter \ Es5SetterCallback setter \
) { \ ) { \
Napi::Function proto = _ctorEs5.Value().Get("prototype").As<Napi::Function>(); \ Napi::Function proto = _ctorEs5.Value().Get("prototype").As<Napi::Function>(); \
proto.DefineProperty( \ proto.DefineProperty( \