diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-02-26 04:10:18 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-02-26 04:21:28 +0200 |
| commit | f683b10e106e7376322b9c67c2baf57f5022cec2 (patch) | |
| tree | 44b061f7538554ff2428c65bd69944326ef890ed /platform/default/online_file_source.cpp | |
| parent | c8b7066d2e83d3a6f9f72b7db6681b437fa0dc9d (diff) | |
| download | qtlocation-mapboxgl-f683b10e106e7376322b9c67c2baf57f5022cec2.tar.gz | |
[core] Build fix
Fix no viable conversion on OSX.
Diffstat (limited to 'platform/default/online_file_source.cpp')
| -rw-r--r-- | platform/default/online_file_source.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp index f6a971319d..a39aee35a1 100644 --- a/platform/default/online_file_source.cpp +++ b/platform/default/online_file_source.cpp @@ -271,7 +271,7 @@ SystemTimePoint interpolateExpiration(const SystemTimePoint& current, // Assume that either the client or server clock is wrong and // try to interpolate a valid expiration date (from the client POV) // observing a minimum timeout. - return now + std::max<Duration>(delta, util::CLOCK_SKEW_RETRY_TIMEOUT); + return now + std::max<SystemDuration>(delta, util::CLOCK_SKEW_RETRY_TIMEOUT); } void OnlineFileRequestImpl::schedule(OnlineFileSource::Impl& impl, optional<SystemTimePoint> expires) { |