Skip to content

Commit 32725d2

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 fe3cee7 commit 32725d2

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

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

deps/v8/include/v8.h

+4
Original file line numberDiff line numberDiff line change
@@ -1423,7 +1423,9 @@ class ScriptOriginOptions {
14231423
*/
14241424
class ScriptOrigin {
14251425
public:
1426+
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
14261427
V8_DEPRECATE_SOON("Use constructor with primitvie C++ types")
1428+
#endif
14271429
V8_INLINE explicit ScriptOrigin(
14281430
Local<Value> resource_name, Local<Integer> resource_line_offset,
14291431
Local<Integer> resource_column_offset,
@@ -1918,9 +1920,11 @@ class V8_EXPORT ScriptCompiler {
19181920
public:
19191921
enum Encoding { ONE_BYTE, TWO_BYTE, UTF8 };
19201922

1923+
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
19211924
V8_DEPRECATED(
19221925
"This class takes ownership of source_stream, so use the constructor "
19231926
"taking a unique_ptr to make these semantics clearer")
1927+
#endif
19241928
StreamedSource(ExternalSourceStream* source_stream, Encoding encoding);
19251929
StreamedSource(std::unique_ptr<ExternalSourceStream> source_stream,
19261930
Encoding encoding);

0 commit comments

Comments
 (0)