Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion stdlib/public/Concurrency/DispatchGlobalExecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,14 @@ clock_and_value_to_time(int clock, long long sec, long long nsec) {
.tv_sec = sec,
.tv_nsec = static_cast<long>(nsec)
};
#elif defined(__APPLE__)
struct timespec ts = {
.tv_sec = static_cast<__darwin_time_t>(sec),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use decltype here to solve the problem portably?

.tv_nsec = nsec
};
#else
struct timespec ts = {
.tv_sec = sec,
.tv_sec = static_cast<long>(sec),
.tv_nsec = nsec
};
#endif
Expand Down