src: refactor call js wrapper (#1242)

* src: Refactor CallJsWrapper to workaround vs-17
nodejs · Dec 12, 2022 · ad7ff92 · ad7ff92
1 parent 39267ba
commit ad7ff92
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/napi-inl.h b/napi-inl.h
@@ -255,17 +255,20 @@ struct ThreadSafeFinalize {
 };
 
 template <typename ContextType, typename DataType, typename CallJs, CallJs call>
-typename std::enable_if<call != nullptr>::type static inline CallJsWrapper(
-    napi_env env, napi_value jsCallback, void* context, void* data) {
+inline typename std::enable_if<call != static_cast<CallJs>(nullptr)>::type
+CallJsWrapper(napi_env env, napi_value jsCallback, void* context, void* data) {
   call(env,
        Function(env, jsCallback),
        static_cast<ContextType*>(context),
        static_cast<DataType*>(data));
 }
 
 template <typename ContextType, typename DataType, typename CallJs, CallJs call>
-typename std::enable_if<call == nullptr>::type static inline CallJsWrapper(
-    napi_env env, napi_value jsCallback, void* /*context*/, void* /*data*/) {
+inline typename std::enable_if<call == static_cast<CallJs>(nullptr)>::type
+CallJsWrapper(napi_env env,
+              napi_value jsCallback,
+              void* /*context*/,
+              void* /*data*/) {
   if (jsCallback != nullptr) {
     Function(env, jsCallback).Call(0, nullptr);
   }