Skip to content

Commit 66fb9a7

Browse files
joaocgreisnodejs-ci
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/node#32116 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent 63dccce commit 66fb9a7

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
@@ -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.4',
39+
'v8_embedder_string': '-node.5',
4040

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

deps/v8/include/v8.h

+2
Original file line numberDiff line numberDiff line change
@@ -1839,9 +1839,11 @@ class V8_EXPORT ScriptCompiler {
18391839
public:
18401840
enum Encoding { ONE_BYTE, TWO_BYTE, UTF8 };
18411841

1842+
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
18421843
V8_DEPRECATE_SOON(
18431844
"This class takes ownership of source_stream, so use the constructor "
18441845
"taking a unique_ptr to make these semantics clearer")
1846+
#endif
18451847
StreamedSource(ExternalSourceStream* source_stream, Encoding encoding);
18461848
StreamedSource(std::unique_ptr<ExternalSourceStream> source_stream,
18471849
Encoding encoding);

0 commit comments

Comments
 (0)