diff options
| author | Julian Andres Klode <jak@debian.org> | 2022-09-21 10:42:58 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2022-09-21 10:42:58 +0000 |
| commit | 6bc11782aba64e9eeb33fbb2542d2597bb710a8e (patch) | |
| tree | 06458e86df6094d3e03984d3330d4f15159ea4d4 /apt-pkg/contrib | |
| parent | 6499f7dc842ebd621f11ea01e83ccbe4125a0581 (diff) | |
| parent | 81a5256298f1e4403591bdaf95957e832da75d31 (diff) | |
Merge branch 'clang15' into 'main'
typecast time_t and suseconds_t from std::chrono
See merge request apt-team/apt!259
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/progress.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 03f88d4ce..eb688b9a2 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -122,7 +122,7 @@ bool OpProgress::CheckChange(float Interval) auto const Now = std::chrono::steady_clock::now().time_since_epoch(); auto const Now_sec = std::chrono::duration_cast<std::chrono::seconds>(Now); auto const Now_usec = std::chrono::duration_cast<std::chrono::microseconds>(Now - Now_sec); - struct timeval NowTime = { Now_sec.count(), Now_usec.count() }; + struct timeval NowTime = { static_cast<time_t>(Now_sec.count()), static_cast<suseconds_t>(Now_usec.count()) }; std::chrono::duration<decltype(Interval)> Delta = std::chrono::seconds(NowTime.tv_sec - LastTime.tv_sec) + |