Skip to content

Commit e981215

Browse files
joaocgreistargos
authored andcommitted
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: #32116 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent 88ae710 commit e981215

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.h

+4
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,9 @@ class ScriptOriginOptions {
14411441
*/
14421442
class ScriptOrigin {
14431443
public:
1444+
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
14441445
V8_DEPRECATED("Use constructor with primitive C++ types")
1446+
#endif
14451447
V8_INLINE explicit ScriptOrigin(
14461448
Local<Value> resource_name, Local<Integer> resource_line_offset,
14471449
Local<Integer> resource_column_offset,
@@ -1452,7 +1454,9 @@ class ScriptOrigin {
14521454
Local<Boolean> is_wasm = Local<Boolean>(),
14531455
Local<Boolean> is_module = Local<Boolean>(),
14541456
Local<PrimitiveArray> host_defined_options = Local<PrimitiveArray>());
1457+
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
14551458
V8_DEPRECATED("Use constructor that takes an isolate")
1459+
#endif
14561460
V8_INLINE explicit ScriptOrigin(
14571461
Local<Value> resource_name, int resource_line_offset = 0,
14581462
int resource_column_offset = 0,

0 commit comments

Comments
 (0)