mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 20:19:00 +08:00
229f537c94
* Add meson from https://github.com/microsoft/vcpkg/pull/12860/ * Add autoconf-archive from https://github.com/microsoft/vcpkg/pull/13081/ * Add kf5windowsystem libs from https://github.com/microsoft/vcpkg/pull/13467/ * Open the FTP and SFTP ports from https://github.com/microsoft/vcpkg/pull/14412/ * Add libxcb-util0-dev from https://github.com/microsoft/vcpkg/pull/14678/ * Add libasound2-dev from https://github.com/microsoft/vcpkg/pull/14774 * Remove no longer necessary apt-mark calls. * Update nasm on Linux. * Fix longstanding bug where Storage was publicly accessible and change to generate SAS token rather than File Share * Delete no longer necessary azure storage firewall rules. * Install the newer Windows SDK with the VS installer instead of manually. * Install the VS2015 and VS2017 compilers. * Update Powershell-Core to 7.1.0. * Update source of WDK. * Update pools. * [opentracing] Repair arm64-windows failures caused by mojibake in `expected.hpp` and errors in opentracing-cpp's lint for arm64 where it thinks exceptions are disabled when they are enabled. Fixes: C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001). Fixes: D:\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\include\opentracing/tracer.h:223:5: error: cannot use 'try' with exceptions disabled [clang-diagnostic-error] try { ^ * [mmloader] Patch out overrides of CMAKE_C_FLAGS and CMAKE_CXX_FLAGS that inserted /WX. Note that this port sets /GS-, possibly because it may be for authoring shellcode. * Bump storage API version to 2020-04-08.
60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
From 31c92781ac953cb83963cfe5ac30324579fa7b2d Mon Sep 17 00:00:00 2001
|
||
From: Billy Robert O'Neal III <bion@microsoft.com>
|
||
Date: Fri, 18 Dec 2020 10:07:02 -0800
|
||
Subject: [PATCH] Repair mojibake in expected.hpp
|
||
|
||
The affected characters herein triggered warnings
|
||
C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001).
|
||
---
|
||
3rd_party/include/opentracing/expected/expected.hpp | 12 ++++++------
|
||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
||
diff --git a/3rd_party/include/opentracing/expected/expected.hpp b/3rd_party/include/opentracing/expected/expected.hpp
|
||
index 8283a77..0d21d43 100644
|
||
--- a/3rd_party/include/opentracing/expected/expected.hpp
|
||
+++ b/3rd_party/include/opentracing/expected/expected.hpp
|
||
@@ -778,13 +778,13 @@ class expected
|
||
// expected<decltype(func(declval<T>())),E> map(F&& func) ;
|
||
|
||
// template <typename F>
|
||
-// ’see below’ bind(F&& func);
|
||
+// 'see below' bind(F&& func);
|
||
|
||
// template <typename F>
|
||
// expected<T,E> catch_error(F&& f);
|
||
|
||
// template <typename F>
|
||
-// ’see below’ then(F&& func);
|
||
+// 'see below' then(F&& func);
|
||
|
||
private:
|
||
bool has_value_;
|
||
@@ -955,9 +955,9 @@ class expected<void, E>
|
||
return ! has_value() && std::is_base_of< Ex, decltype( get_unexpected().value() ) >::value;
|
||
}
|
||
|
||
-// template constexpr ’see below’ unwrap() const&;
|
||
+// template constexpr 'see below' unwrap() const&;
|
||
//
|
||
-// template ’see below’ unwrap() &&;
|
||
+// template 'see below' unwrap() &&;
|
||
|
||
// factories
|
||
|
||
@@ -968,13 +968,13 @@ class expected<void, E>
|
||
// expected<decltype(func()), E> map(F&& func) ;
|
||
//
|
||
// template <typename F>
|
||
-// ’see below’ bind(F&& func) ;
|
||
+// 'see below' bind(F&& func) ;
|
||
//
|
||
// template <typename F>
|
||
// expected<void,E> catch_error(F&& f);
|
||
//
|
||
// template <typename F>
|
||
-// ’see below’ then(F&& func);
|
||
+// 'see below' then(F&& func);
|
||
|
||
private:
|
||
bool has_value_;
|