You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.1 KiB
31 lines
1.1 KiB
From 111c08d0eaa134652f1f1e602ead1a539614258f Mon Sep 17 00:00:00 2001
|
|
From: Thiago Macieira <thiago.macieira@intel.com>
|
|
Date: Mon, 11 Mar 2024 11:24:00 -0400
|
|
Subject: [PATCH] QFutureInterface: fix build with GCC14/C++20: template-id not
|
|
allowed
|
|
|
|
When declaring a constructor, you must use the injected name, not a
|
|
template.
|
|
|
|
qfutureinterface.h:472:37: error: template-id not allowed for constructor in C++20 [-Werror=template-id-cdtor]
|
|
|
|
Pick-to: 6.6 6.7
|
|
Change-Id: I6818d78a57394e37857bfffd17bbbf2313001cbf
|
|
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
|
|
---
|
|
src/corelib/thread/qfutureinterface.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h
|
|
index fa5e8ea7bab..180a59a94e7 100644
|
|
--- a/src/corelib/thread/qfutureinterface.h
|
|
+++ b/src/corelib/thread/qfutureinterface.h
|
|
@@ -469,7 +469,7 @@ template <>
|
|
class QFutureInterface<void> : public QFutureInterfaceBase
|
|
{
|
|
public:
|
|
- explicit QFutureInterface<void>(State initialState = NoState)
|
|
+ explicit QFutureInterface(State initialState = NoState)
|
|
: QFutureInterfaceBase(initialState)
|
|
{ }
|