mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 04:12:19 +08:00
5a10163c44
* osgearth:x64-windows-static-md fixes * Try to build for x64-windows-static-md * Fix builds * Indent and combine blocks * overwrite version * merge with master and update version * revert incorrect version changes * [osgearth] Improve portfile.cmake, add feature tools * update version record * disable fontconfig on windows * update version * [osgearth] Fix dependencies * [osgearth] Re-fix dependencies * [osgearth] Fix the sequence of linking osg * [osgearth] Fix dependency osg * update version record * Fix osgearth:x64-linux * x64-windows-static-md fixes * Fix x64-linux * Build fixes * Update x-add-version Co-authored-by: ankurv <ankurv@microsoft.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
29 lines
933 B
Diff
29 lines
933 B
Diff
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
|
|
|