diff options
-rw-r--r-- | gcc/cp/cvt.c | 3 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/concepts-nodiscard1.C | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index bcd7c5a..29ceaeb 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -1031,6 +1031,9 @@ cp_get_callee_fndecl_nofold (tree call) static void maybe_warn_nodiscard (tree expr, impl_conv_void implicit) { + if (!warn_unused_result || c_inhibit_evaluation_warnings) + return; + tree call = expr; if (TREE_CODE (expr) == TARGET_EXPR) call = TARGET_EXPR_INITIAL (expr); diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-nodiscard1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-nodiscard1.C index 907e68b..3d5cd85 100644 --- a/gcc/testsuite/g++.dg/cpp2a/concepts-nodiscard1.C +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-nodiscard1.C @@ -1,6 +1,6 @@ // PR c++/98019 // { dg-do compile { target c++20 } } -// { dg-excess-errors *-*-* } +// Don't give [[nodiscard]] warning for an expression requirement. template <class T, class U> concept same_as = __is_same_as (T, U); |