diff options
| author | Joao Reis <reis@janeasystems.com> | 2021-09-22 12:54:34 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2021-11-21 16:10:03 +0100 |
| commit | eab5ef5505891b6b4ad4df84e797b45f47b0c61d (patch) | |
| tree | 1bb1925a9272fd87bd5cfb18e61506f015547703 | |
| parent | d6e5dd56ffd3fbe3a55c9719117da186e849534c (diff) | |
| download | node-new-eab5ef5505891b6b4ad4df84e797b45f47b0c61d.tar.gz | |
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: https://github.com/nodejs/node/pull/32116
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
| -rw-r--r-- | common.gypi | 2 | ||||
| -rw-r--r-- | deps/v8/include/v8-message.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index 652af7469e..fdb23501ae 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.3', + 'v8_embedder_string': '-node.4', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/include/v8-message.h b/deps/v8/include/v8-message.h index 62b6bd92f9..be427e79cf 100644 --- a/deps/v8/include/v8-message.h +++ b/deps/v8/include/v8-message.h @@ -60,7 +60,9 @@ class ScriptOriginOptions { */ class V8_EXPORT ScriptOrigin { public: + #if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */ V8_DEPRECATE_SOON("Use constructor with primitive C++ types") + #endif ScriptOrigin( Local<Value> resource_name, Local<Integer> resource_line_offset, Local<Integer> resource_column_offset, @@ -71,7 +73,9 @@ class V8_EXPORT ScriptOrigin { Local<Boolean> is_wasm = Local<Boolean>(), Local<Boolean> is_module = Local<Boolean>(), Local<PrimitiveArray> host_defined_options = Local<PrimitiveArray>()); + #if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */ V8_DEPRECATE_SOON("Use constructor that takes an isolate") + #endif explicit ScriptOrigin( Local<Value> resource_name, int resource_line_offset = 0, int resource_column_offset = 0, |