From fae219555393111bd302a3a9995fc47178c5a91d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= <nexyon@gmail.com>
Date: Tue, 6 Aug 2024 17:59:20 +0200
Subject: [PATCH] Audaspace: merge changes from upstream.

---
 extern/audaspace/CMakeLists.txt            | 4 +++-
 extern/audaspace/include/util/ThreadPool.h | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/extern/audaspace/CMakeLists.txt b/extern/audaspace/CMakeLists.txt
index 555278b2161..d5f8ea237d8 100644
--- a/extern/audaspace/CMakeLists.txt
+++ b/extern/audaspace/CMakeLists.txt
@@ -338,8 +338,10 @@ endif()
 # compiler options
 
 if(AUDASPACE_STANDALONE)
+	set(CMAKE_CXX_STANDARD 17)
+	set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 	if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-		add_definitions(-std=c++11)
 		list(APPEND CMAKE_C_COMPILER_FLAGS "-fvisibility=hidden")
 		list(APPEND CMAKE_CXX_COMPILER_FLAGS "-fvisibility=hidden")
 	endif()
diff --git a/extern/audaspace/include/util/ThreadPool.h b/extern/audaspace/include/util/ThreadPool.h
index 24ec089d52c..39522ab9d05 100644
--- a/extern/audaspace/include/util/ThreadPool.h
+++ b/extern/audaspace/include/util/ThreadPool.h
@@ -88,9 +88,9 @@ public:
 	* \return A future of the same type as the return type of the task.
 	*/
 	template<class T, class... Args>
-	std::future<typename std::result_of<T(Args...)>::type> enqueue(T&& t, Args&&... args)
+	auto enqueue(T&& t, Args&&... args)
 	{
-		using pkgdTask = std::packaged_task<typename std::result_of<T(Args...)>::type()>;
+		using pkgdTask = std::packaged_task<typename std::invoke_result<T, Args...>::type()>;
 
 		std::shared_ptr<pkgdTask> task = std::make_shared<pkgdTask>(std::bind(std::forward<T>(t), std::forward<Args>(args)...));
 		auto result = task->get_future();