From 321731ce73be4ea79adb2174591ce94695d3e85b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Offringa?= <offringa@astron.nl>
Date: Sun, 19 Jan 2025 21:01:39 +0100
Subject: [PATCH 1/2] Fix compilation error due to template id in constructor

---
 include/ola/thread/FuturePrivate.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/ola/thread/FuturePrivate.h b/include/ola/thread/FuturePrivate.h
index e2f065fb9f..ff3b2e425d 100644
--- a/include/ola/thread/FuturePrivate.h
+++ b/include/ola/thread/FuturePrivate.h
@@ -89,7 +89,8 @@ class FutureImpl {
   bool m_is_set;
   T m_value;
 
-  DISALLOW_COPY_AND_ASSIGN(FutureImpl<T>);
+  FutureImpl(const FutureImpl<T>&) = delete;
+  FutureImpl<T> operator=(const FutureImpl<T>&) = delete;
 };
 
 /**
@@ -152,7 +153,8 @@ class FutureImpl<void> {
   unsigned int m_ref_count;
   bool m_is_set;
 
-  DISALLOW_COPY_AND_ASSIGN(FutureImpl<void>);
+  FutureImpl(const FutureImpl<void>&) = delete;
+  FutureImpl<void> operator=(const FutureImpl<void>&) = delete;
 };
 
 }  // namespace thread

From 4006f2129f0a6061d59fe5892a2a17c53699a31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Offringa?= <offringa@astron.nl>
Date: Sun, 19 Jan 2025 21:05:55 +0100
Subject: [PATCH 2/2] Add missing &

---
 include/ola/thread/FuturePrivate.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/ola/thread/FuturePrivate.h b/include/ola/thread/FuturePrivate.h
index ff3b2e425d..7e3fdac5c3 100644
--- a/include/ola/thread/FuturePrivate.h
+++ b/include/ola/thread/FuturePrivate.h
@@ -90,7 +90,7 @@ class FutureImpl {
   T m_value;
 
   FutureImpl(const FutureImpl<T>&) = delete;
-  FutureImpl<T> operator=(const FutureImpl<T>&) = delete;
+  FutureImpl<T>& operator=(const FutureImpl<T>&) = delete;
 };
 
 /**
@@ -154,7 +154,7 @@ class FutureImpl<void> {
   bool m_is_set;
 
   FutureImpl(const FutureImpl<void>&) = delete;
-  FutureImpl<void> operator=(const FutureImpl<void>&) = delete;
+  FutureImpl<void>& operator=(const FutureImpl<void>&) = delete;
 };
 
 }  // namespace thread