diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/util/http_header.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/util/http_timeout.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/util/http_header.cpp b/src/mbgl/util/http_header.cpp index b318e979fa..6827452efe 100644 --- a/src/mbgl/util/http_header.cpp +++ b/src/mbgl/util/http_header.cpp @@ -23,7 +23,7 @@ CacheControl CacheControl::parse(const std::string& value) { } optional<Timestamp> CacheControl::toTimePoint() const { - return maxAge ? util::now() + Seconds(*maxAge) : optional<Timestamp>{}; + return maxAge ? std::chrono::system_clock::now() + Seconds(*maxAge) : optional<Timestamp>{}; } optional<Timestamp> parseRetryHeaders(const optional<std::string>& retryAfter, diff --git a/src/mbgl/util/http_timeout.cpp b/src/mbgl/util/http_timeout.cpp index 18d53e237c..10d43e1588 100644 --- a/src/mbgl/util/http_timeout.cpp +++ b/src/mbgl/util/http_timeout.cpp @@ -18,7 +18,7 @@ Duration errorRetryTimeout(Response::Error::Reason failedRequestReason, uint32_t return Seconds(1u << std::min(failedRequests - 1, 31u)); } else if (failedRequestReason == Response::Error::Reason::RateLimit) { if (retryAfter) { - return *retryAfter - util::now(); + return *retryAfter - std::chrono::system_clock::now(); } else { // Default return Seconds(util::DEFAULT_RATE_LIMIT_TIMEOUT); @@ -33,7 +33,7 @@ Duration expirationTimeout(optional<Timestamp> expires, uint32_t expiredRequests if (expiredRequests) { return Seconds(1u << std::min(expiredRequests - 1, 31u)); } else if (expires) { - return std::max(std::chrono::system_clock::duration::zero(), *expires - util::now()); + return std::max(std::chrono::system_clock::duration::zero(), *expires - std::chrono::system_clock::now()); } else { return Duration::max(); } |