Commit 32725d2
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 <targos@protonmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>1 parent fe3cee7 commit 32725d2
2 files changed
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.4', | ||
| 39 | + 'v8_embedder_string': '-node.5', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1423,7 +1423,9 @@ class ScriptOriginOptions { | |||
| 1423 | 1423 | */ | |
| 1424 | 1424 | class ScriptOrigin { | |
| 1425 | 1425 | public: | |
| 1426 | + #if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */ | ||
| 1426 | 1427 | V8_DEPRECATE_SOON("Use constructor with primitvie C++ types") | |
| 1428 | + #endif | ||
| 1427 | 1429 | V8_INLINE explicit ScriptOrigin( | |
| 1428 | 1430 | Local<Value> resource_name, Local<Integer> resource_line_offset, | |
| 1429 | 1431 | Local<Integer> resource_column_offset, | |
@@ -1918,9 +1920,11 @@ class V8_EXPORT ScriptCompiler { | |||
| 1918 | 1920 | public: | |
| 1919 | 1921 | enum Encoding { ONE_BYTE, TWO_BYTE, UTF8 }; | |
| 1920 | 1922 | ||
| 1923 | + #if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */ | ||
| 1921 | 1924 | V8_DEPRECATED( | |
| 1922 | 1925 | "This class takes ownership of source_stream, so use the constructor " | |
| 1923 | 1926 | "taking a unique_ptr to make these semantics clearer") | |
| 1927 | + #endif | ||
| 1924 | 1928 | StreamedSource(ExternalSourceStream* source_stream, Encoding encoding); | |
| 1925 | 1929 | StreamedSource(std::unique_ptr<ExternalSourceStream> source_stream, | |
| 1926 | 1930 | Encoding encoding); | |
0 commit comments