From 95f2213eed80232e6ddfbf8aad1db13af3c45aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Thu, 8 Aug 2024 06:53:41 +0200 Subject: [PATCH] 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: https://github.com/nodejs/node/pull/54077 Reviewed-By: Jiawen Geng Reviewed-By: Richard Lau Reviewed-By: Joyee Cheung Reviewed-By: Marco Ippolito PR-URL: https://github.com/nodejs/node/pull/54536 Reviewed-By: Antoine du Hamel --- common.gypi | 2 +- deps/v8/include/v8config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index f2d3ed4730f..74c4b120c11 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.5', + 'v8_embedder_string': '-node.6', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/include/v8config.h b/deps/v8/include/v8config.h index 1b6a37b2dd4..b6d087b958e 100644 --- a/deps/v8/include/v8config.h +++ b/deps/v8/include/v8config.h @@ -677,7 +677,7 @@ path. Add it with -I to the command line // V8_NODISCARD Foo() { ... }; // [[nodiscard]] comes in C++17 but supported in clang with -std >= c++11. #if V8_HAS_CPP_ATTRIBUTE_NODISCARD -#define V8_NODISCARD [[nodiscard]] +#define V8_NODISCARD #else #define V8_NODISCARD /* NOT SUPPORTED */ #endif