averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

runtime: adjust template expression for C++17 changes

Browse Source 
`std::result_of_t` has been deprecated and replaced with
`std::invoke_result_t`. Update to the newer spelling to avoid the C++17
deprecation warnings when building with a new STL.
This commit is contained in:
Saleem Abdulrasool
2024-12-12 21:55:48 -08:00
parent 215db61ea7
commit 1dad536745
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/swift/Runtime/Win32.h
View File

@@ -114,12 +114,12 @@ static inline void _swift_win32_withDbgHelpLibrary(
/// their old value before returning. \a body can also call \c SymSetOptions()
/// if needed.
template <
typename F,
typename R = typename std::result_of_t<F&(HANDLE /*hProcess*/)>,
typename = typename std::enable_if_t<!std::is_same<void, R>::value>
typename Callable,
typename ResultType = std::invoke_result_t<Callable&, HANDLE>,
typename = std::enable_if_t<!std::is_same_v<void, ResultType>>
>
static inline R _swift_win32_withDbgHelpLibrary(const F& body) {
R result;
static inline ResultType _swift_win32_withDbgHelpLibrary(const Callable& body) {
ResultType result;
_swift_win32_withDbgHelpLibrary([&body, &result] (HANDLE hProcess) {
result = body(hProcess);