Skip to content

Commit 0d3f1d1

Browse files
joaocgreismmarchini
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: nodejs#32116 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
1 parent c813654 commit 0d3f1d1

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
# Reset this number to 0 on major V8 upgrades.
3737
# Increment by one for each non-official patch applied to deps/v8.
38-
'v8_embedder_string': '-node.5',
38+
'v8_embedder_string': '-node.6',
3939

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

deps/v8/include/v8.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1760,9 +1760,11 @@ class V8_EXPORT ScriptCompiler {
17601760
public:
17611761
enum Encoding { ONE_BYTE, TWO_BYTE, UTF8 };
17621762

1763+
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
17631764
V8_DEPRECATE_SOON(
17641765
"This class takes ownership of source_stream, so use the constructor "
17651766
"taking a unique_ptr to make these semantics clearer")
1767+
#endif
17661768
StreamedSource(ExternalSourceStream* source_stream, Encoding encoding);
17671769
StreamedSource(std::unique_ptr<ExternalSourceStream> source_stream,
17681770
Encoding encoding);

0 commit comments

Comments
 (0)