Commit e2fc08f
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: #33376
PR-URL: #32831
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent 74b623b commit e2fc08f
2 files changed
Lines changed: 3 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.5', | ||
| 39 | + 'v8_embedder_string': '-node.6', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1752,9 +1752,11 @@ class V8_EXPORT ScriptCompiler { | |||
| 1752 | 1752 | public: | |
| 1753 | 1753 | enum Encoding { ONE_BYTE, TWO_BYTE, UTF8 }; | |
| 1754 | 1754 | ||
| 1755 | + #if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */ | ||
| 1755 | 1756 | V8_DEPRECATE_SOON( | |
| 1756 | 1757 | "This class takes ownership of source_stream, so use the constructor " | |
| 1757 | 1758 | "taking a unique_ptr to make these semantics clearer") | |
| 1759 | + #endif | ||
| 1758 | 1760 | StreamedSource(ExternalSourceStream* source_stream, Encoding encoding); | |
| 1759 | 1761 | StreamedSource(std::unique_ptr<ExternalSourceStream> source_stream, | |
| 1760 | 1762 | Encoding encoding); | |
0 commit comments