blob: 7a56041983f2bd57a6e30229febf6dc4869f5cc2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
From 89bea8378ae632b0caa134293f713b927774ab50 Mon Sep 17 00:00:00 2001
From: ankurv <ankurv@microsoft.com>
Date: Sun, 3 Jan 2021 11:05:32 -0800
Subject: [PATCH] Patch
---
src/osgEarth/Threading | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/osgEarth/Threading b/src/osgEarth/Threading
index 9093ca6..0fbd9ce 100644
--- a/src/osgEarth/Threading
+++ b/src/osgEarth/Threading
@@ -602,7 +602,11 @@ namespace osgEarth { namespace Threading
template<typename Fn, typename... Args>
constexpr auto cpp11invoke(Fn&& f, Args&&... args)
noexcept(noexcept(std::forward<Fn>(f)(std::forward<Args>(args)...)))
+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
+ -> typename std::invoke_result<Fn(Args...)>::type
+#else
-> typename std::result_of<Fn(Args...)>::type
+#endif
{
return std::forward<Fn>(f)(std::forward<Args>(args)...);
}
--
2.29.2.windows.3
|
