From 66b305f86fdee1c27edcb39f299b052c87d2d82e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 16 Sep 2022 20:00:30 -0700 Subject: typecast time_t and suseconds_t from std::chrono This fixes build on some architectures like mips progress.cc:125:31: error: non-constant-expression cannot be narrowed from type 'std::chrono::duration::rep' (aka 'long long') to '__time_t' (aka 'long') in initializer list [-Wc++11-narrowing] struct timeval NowTime = { Now_sec.count(), Now_usec.count() }; Signed-off-by: Khem Raj --- apt-pkg/acquire.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apt-pkg/acquire.cc') diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 100ccde32..dd0624ad6 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -53,11 +53,11 @@ using namespace std; // helper to convert time_point to a timeval -static struct timeval SteadyDurationToTimeVal(std::chrono::steady_clock::duration Time) +constexpr struct timeval SteadyDurationToTimeVal(std::chrono::steady_clock::duration Time) { auto const Time_sec = std::chrono::duration_cast(Time); auto const Time_usec = std::chrono::duration_cast(Time - Time_sec); - return {Time_sec.count(), Time_usec.count()}; + return timeval{static_cast(Time_sec.count()), static_cast(Time_usec.count())}; } std::string pkgAcquire::URIEncode(std::string const &part) /*{{{*/ -- cgit v1.2.3-70-g09d2