Skip to content

node-api,src: fix module registration in MSVC C++ #42459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vmoroz wants to merge 4 commits into from
Closed

node-api,src: fix module registration in MSVC C++ #42459

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93eecc8
node-api,src: fix module registration in MSVC C++
vmoroz Mar 24, 2022
2b38a2a
add a guard for the new C++17 features
vmoroz Mar 30, 2022
69a6843
change code to use simple C++ initialization
vmoroz Apr 2, 2022
ec61c24
Remove C++17 specific code from tests
vmoroz Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add a guard for the new C++17 features
  • Loading branch information
@vmoroz
vmoroz committed Mar 30, 2022
commit 2b38a2a085b91a177a43c64c57605fdd1c637295
2 changes: 1 addition & 1 deletion src/node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ extern "C" NODE_EXTERN void node_module_register(void* mod);
#endif

#if defined(_MSC_VER)
#if defined(__cplusplus)
#if defined(__cplusplus) && defined(__cpp_inline_variables)
// The NODE_C_CTOR macro defines a function fn that is called during dynamic
// initialization of static variables.
// The order of the dynamic initialization is not defined and code in fn
Expand Down
2 changes: 1 addition & 1 deletion src/node_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ typedef struct napi_module {
#define NAPI_MODULE_VERSION 1

#if defined(_MSC_VER)
#if defined(__cplusplus)
#if defined(__cplusplus) && defined(__cpp_inline_variables)
// The NAPI_C_CTOR macro defines a function fn that is called during dynamic
// initialization of static variables.
// The order of the dynamic initialization is not defined and code in fn
Expand Down