Skip to content

Commit d22c41b

Browse files
committed
Address comments
1 parent 3768545 commit d22c41b

3 files changed

Lines changed: 17 additions & 8 deletions

File tree

binding.gyp

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,22 @@
104104
'defines': [
105105
'OS_WINDOWS'
106106
],
107+
'conditions': [
108+
[
109+
'node_major_version >= 23', {
110+
'cflags_cc': [
111+
'-std=c++20'
112+
]
113+
}
114+
],
115+
[
116+
'node_major_version < 23', {
117+
'cflags_cc': [
118+
'-std=c++17'
119+
]
120+
}
121+
]
122+
],
107123
'include_dirs': [
108124
'./src/third_party/dlfcn-win32/',
109125
],
@@ -113,7 +129,6 @@
113129
'msvs_settings': {
114130
'VCCLCompilerTool': {
115131
'ExceptionHandling': '2', # /EHsc
116-
'AdditionalOptions': ['/std:c++20']
117132
},
118133
'VCLinkerTool': {
119134
'AdditionalDependencies': ['psapi.lib'],
@@ -132,7 +147,7 @@
132147
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
133148
'CLANG_CXX_LIBRARY': 'libc++',
134149
'MACOS_DEPLOYMENT_TARGET': '10.12',
135-
'CLANG_CXX_LANGUAGE_STANDARD': 'c++20'
150+
'CLANG_CXX_LANGUAGE_STANDARD': 'c++17'
136151
}
137152
}
138153
],

rosidl_gen/primitive_types.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
const ref = require('../third_party/ref-napi');
1818
const StructType = require('@rclnodejs/ref-struct-di')(ref);
19-
// const rclnodejs = require('bindings')('rclnodejs');
2019
const rclnodejs = require('../lib/native_loader.js');
2120

2221
const StringRefStruct = StructType({

third_party/ref-napi/lib/ref.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ const assert = require('assert');
33
const inspect = require('util').inspect;
44
const debug = require('debug')('ref');
55
const os = require('os');
6-
const path = require('path');
7-
// const addon = require('bindings')({
8-
// bindings: 'rclnodejs',
9-
// module_root: path.resolve(__dirname, '..', '..', '..'),
10-
// });
116
const addon = require('../../../lib/native_loader.js');
127

138
if (!addon || !addon.ref) {

0 commit comments

Comments
 (0)