Skip to content

Commit 277d32e

Browse files
targosnodejs-github-bot
authored andcommitted
deps: always define V8_NODISCARD as no-op
It's causing compiler errors with some classes on Xcode 11 and the attribute should have no runtime effect. PR-URL: nodejs/node#54077 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> PR-URL: nodejs/node#55014 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent 11ecee2 commit 277d32e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
# Reset this number to 0 on major V8 upgrades.
3939
# Increment by one for each non-official patch applied to deps/v8.
40-
'v8_embedder_string': '-node.5',
40+
'v8_embedder_string': '-node.6',
4141

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

deps/v8/include/v8config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ path. Add it with -I<path> to the command line
687687
// V8_NODISCARD Foo() { ... };
688688
// [[nodiscard]] comes in C++17 but supported in clang with -std >= c++11.
689689
#if V8_HAS_CPP_ATTRIBUTE_NODISCARD
690-
#define V8_NODISCARD [[nodiscard]]
690+
#define V8_NODISCARD
691691
#else
692692
#define V8_NODISCARD /* NOT SUPPORTED */
693693
#endif

0 commit comments

Comments
 (0)