Skip to content

Commit 4638361

Browse files
joaocgreisMylesBorins
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 Backport-PR-URL: #30513 PR-URL: #30020 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
1 parent 5bc3573 commit 4638361

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Reset this number to 0 on major V8 upgrades.
4141
# Increment by one for each non-official patch applied to deps/v8.
42-
'v8_embedder_string': '-node.7',
42+
'v8_embedder_string': '-node.8',
4343

4444
##### V8 defaults for Node.js #####
4545

deps/v8/include/v8.h

+2
Original file line numberDiff line numberDiff line change
@@ -1738,9 +1738,11 @@ class V8_EXPORT ScriptCompiler {
17381738
public:
17391739
enum Encoding { ONE_BYTE, TWO_BYTE, UTF8 };
17401740

1741+
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
17411742
V8_DEPRECATE_SOON(
17421743
"This class takes ownership of source_stream, so use the constructor "
17431744
"taking a unique_ptr to make these semantics clearer")
1745+
#endif
17441746
StreamedSource(ExternalSourceStream* source_stream, Encoding encoding);
17451747
StreamedSource(std::unique_ptr<ExternalSourceStream> source_stream,
17461748
Encoding encoding);

0 commit comments

Comments
 (0)