Skip to content

Convert DispatchGlobalExecutor deadline casts to a decltype based cast (which should hold on all platforms) #82167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Convert DispatchGlobalExecutor deadline casts to a decltype based cast (which should hold on all platforms) #82167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions stdlib/public/Concurrency/DispatchGlobalExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,22 +314,10 @@ clock_and_value_to_time(int clock, long long sec, long long nsec) {
case swift_clock_id_continuous:
return value | DISPATCH_UP_OR_MONOTONIC_TIME_MASK;
case swift_clock_id_wall: {
#if defined(_WIN32)
struct timespec ts = {
.tv_sec = sec,
.tv_nsec = static_cast<long>(nsec)
};
#elif defined(__APPLE__)
struct timespec ts = {
.tv_sec = static_cast<__darwin_time_t>(sec),
.tv_nsec = nsec
struct timespec ts = {
.tv_sec = static_cast<decltype(ts.tv_sec)>(sec),
.tv_nsec = static_cast<decltype(ts.tv_nsec)>(nsec)
};
#else
struct timespec ts = {
.tv_sec = static_cast<long>(sec),
.tv_nsec = nsec
};
#endif
return dispatch_walltime(&ts, 0);
}
}
Expand Down