Merge bitcoin/bitcoin#24729: util/check: avoid unused parameter warnings

MarcoFalke · MarcoFalke · commit 4faf7a1d86db · 2022-04-04T13:44:10.000+02:00
0add4db util/check: avoid unused parameter warnings (Anthony Towns) Pull request description: Add `[[maybe_unused]]` annotations to avoid warnings from gcc 9.4 and earlier which don't analyse `if constexpr` properly. ACKs for top commit: MarcoFalke: review ACK 0add4db jonatack: ACK 0add4db review and debug build on clang 15 shaavan: ACK 0add4db Tree-SHA512: 3ba490d74d91692c1d22b927da43a130c92cd6a20ed168573e4fbe1f4675fef7e05ebf0b11f2bbd15da3c606fea1f8e6403cfca347009b8b6acc1e77bbee9963
diff --git a/src/util/check.h b/src/util/check.h
@@ -51,7 +51,7 @@ void assertion_fail(const char* file, int line, const char* func, const char* as
 
 /** Helper for Assert()/Assume() */
 template <bool IS_ASSERT, typename T>
-T&& inline_assertion_check(T&& val, const char* file, int line, const char* func, const char* assertion)
+T&& inline_assertion_check(T&& val, [[maybe_unused]] const char* file, [[maybe_unused]] int line, [[maybe_unused]] const char* func, [[maybe_unused]] const char* assertion)
 {
     if constexpr (IS_ASSERT
 #ifdef ABORT_ON_FAILED_ASSUME

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ void assertion_fail(const char* file, int line, const char* func, const char* as`
`51`	`51`
`52`	`52`	`/** Helper for Assert()/Assume() */`
`53`	`53`	`template <bool IS_ASSERT, typename T>`
`54`		`-T&& inline_assertion_check(T&& val, const char* file, int line, const char* func, const char* assertion)`
	`54`	`+T&& inline_assertion_check(T&& val, [[maybe_unused]] const char* file, [[maybe_unused]] int line, [[maybe_unused]] const char* func, [[maybe_unused]] const char* assertion)`
`55`	`55`	`{`
`56`	`56`	`if constexpr (IS_ASSERT`
`57`	`57`	`#ifdef ABORT_ON_FAILED_ASSUME`