From cd2dc9087dd307615cb96fbc5da559553b522ccf Mon Sep 17 00:00:00 2001 From: Joao Reis Date: Wed, 22 Sep 2021 12:54:34 +0200 Subject: [PATCH] deps: make v8.h compatible with VS2015 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-By: Jiawen Geng Reviewed-By: Ruben Bridgewater --- common.gypi | 2 +- deps/v8/include/v8-message.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 652af7469e5..fdb23501ae5 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 a17eb7026dd..d771a49ff9c 100644 --- a/deps/v8/include/v8-message.h +++ b/deps/v8/include/v8-message.h @@ -61,7 +61,9 @@ class ScriptOriginOptions { */ class V8_EXPORT ScriptOrigin { public: + #if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */ V8_DEPRECATED("Use constructor with primitive C++ types") + #endif ScriptOrigin( Local resource_name, Local resource_line_offset, Local resource_column_offset, @@ -72,7 +74,9 @@ class V8_EXPORT ScriptOrigin { Local is_wasm = Local(), Local is_module = Local(), Local host_defined_options = Local()); + #if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */ V8_DEPRECATED("Use constructor that takes an isolate") + #endif explicit ScriptOrigin(Local resource_name, int resource_line_offset = 0, int resource_column_offset = 0,