Skip to content

Commit ad7ff92

Browse files
authored
src: refactor call js wrapper (#1242)
* src: Refactor CallJsWrapper to workaround vs-17
1 parent 39267ba commit ad7ff92

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

napi-inl.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,17 +255,20 @@ struct ThreadSafeFinalize {
255255
};
256256

257257
template <typename ContextType, typename DataType, typename CallJs, CallJs call>
258-
typename std::enable_if<call != nullptr>::type static inline CallJsWrapper(
259-
napi_env env, napi_value jsCallback, void* context, void* data) {
258+
inline typename std::enable_if<call != static_cast<CallJs>(nullptr)>::type
259+
CallJsWrapper(napi_env env, napi_value jsCallback, void* context, void* data) {
260260
call(env,
261261
Function(env, jsCallback),
262262
static_cast<ContextType*>(context),
263263
static_cast<DataType*>(data));
264264
}
265265

266266
template <typename ContextType, typename DataType, typename CallJs, CallJs call>
267-
typename std::enable_if<call == nullptr>::type static inline CallJsWrapper(
268-
napi_env env, napi_value jsCallback, void* /*context*/, void* /*data*/) {
267+
inline typename std::enable_if<call == static_cast<CallJs>(nullptr)>::type
268+
CallJsWrapper(napi_env env,
269+
napi_value jsCallback,
270+
void* /*context*/,
271+
void* /*data*/) {
269272
if (jsCallback != nullptr) {
270273
Function(env, jsCallback).Call(0, nullptr);
271274
}

0 commit comments

Comments
 (0)