diff options
| author | ankurverma85 <31362771+ankurverma85@users.noreply.github.com> | 2021-03-25 13:28:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 13:28:42 -0700 |
| commit | 5a10163c44526b5d42a67480ce7a692a36948761 (patch) | |
| tree | c62543931827cad6fddf592e41b05a162cdd075e /ports/osgearth/deprecated_cpp_fix.patch | |
| parent | c2e1d32c25c77a258e103e00d778f6d935b44e73 (diff) | |
| download | vcpkg-5a10163c44526b5d42a67480ce7a692a36948761.tar.gz vcpkg-5a10163c44526b5d42a67480ce7a692a36948761.zip | |
[osgearth] Fix x64-windows-static-md (#15375)
* 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>
Diffstat (limited to 'ports/osgearth/deprecated_cpp_fix.patch')
| -rw-r--r-- | ports/osgearth/deprecated_cpp_fix.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/ports/osgearth/deprecated_cpp_fix.patch b/ports/osgearth/deprecated_cpp_fix.patch new file mode 100644 index 000000000..7a5604198 --- /dev/null +++ b/ports/osgearth/deprecated_cpp_fix.patch @@ -0,0 +1,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 + |