Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 58b0b4a

Browse files
joaocgreisnodejs-github-bot
authored andcommittedDec 29, 2021
deps: make v8.h compatible with VS2015
There is a bug in the most recent version of VS2015 that affects v8.h and therefore prevents compilation of addons. Refs: https://stackoverflow.com/q/38378693 PR-URL: nodejs/node#32116 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent e1aa929 commit 58b0b4a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed
 

‎common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.3',
39+
'v8_embedder_string': '-node.4',
4040

4141
##### V8 defaults for Node.js #####
4242

‎deps/v8/include/v8-message.h

+4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ class ScriptOriginOptions {
6161
*/
6262
class V8_EXPORT ScriptOrigin {
6363
public:
64+
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
6465
V8_DEPRECATED("Use constructor with primitive C++ types")
66+
#endif
6567
ScriptOrigin(
6668
Local<Value> resource_name, Local<Integer> resource_line_offset,
6769
Local<Integer> resource_column_offset,
@@ -72,7 +74,9 @@ class V8_EXPORT ScriptOrigin {
7274
Local<Boolean> is_wasm = Local<Boolean>(),
7375
Local<Boolean> is_module = Local<Boolean>(),
7476
Local<Data> host_defined_options = Local<Data>());
77+
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
7578
V8_DEPRECATED("Use constructor that takes an isolate")
79+
#endif
7680
explicit ScriptOrigin(Local<Value> resource_name,
7781
int resource_line_offset = 0,
7882
int resource_column_offset = 0,

0 commit comments

Comments
 (0)
Please sign in to comment.