1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: make v8.h compatible with VS2015

Browse Source 
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: https://github.com/nodejs/node/pull/32116
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Joao Reis 2019-11-01 08:39:18 +01:00 committed by Michaël Zasso
parent 5682e6eed7
commit b1456e3a7b
No known key found for this signature in database
GPG Key ID: 770F7A9A5AE15600
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.gypi
View File

@ -36,7 +36,7 @@
# Reset this number to 0 on major V8 upgrades. # Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8. # Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.4', 'v8_embedder_string': '-node.5',
##### V8 defaults for Node.js ##### ##### V8 defaults for Node.js #####

2
deps/v8/include/v8.h vendored
View File

@ -1756,9 +1756,11 @@ class V8_EXPORT ScriptCompiler {
public: public:
enum Encoding { ONE_BYTE, TWO_BYTE, UTF8 }; enum Encoding { ONE_BYTE, TWO_BYTE, UTF8 };
#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
V8_DEPRECATE_SOON( V8_DEPRECATE_SOON(
"This class takes ownership of source_stream, so use the constructor " "This class takes ownership of source_stream, so use the constructor "
"taking a unique_ptr to make these semantics clearer") "taking a unique_ptr to make these semantics clearer")
#endif
StreamedSource(ExternalSourceStream* source_stream, Encoding encoding); StreamedSource(ExternalSourceStream* source_stream, Encoding encoding);
StreamedSource(std::unique_ptr<ExternalSourceStream> source_stream, StreamedSource(std::unique_ptr<ExternalSourceStream> source_stream,
Encoding encoding); Encoding encoding);