tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Build fix

Browse Source 
Fix no viable conversion on OSX.
This commit is contained in:
Thiago Marcos P. Santos
2016-02-26 04:10:18 +02:00
parent c8b7066d2e
commit f683b10e10
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbgl/util/constants.hpp
View File

@@ -25,7 +25,7 @@ extern const double MAX_ZOOM;
extern const uint64_t DEFAULT_MAX_CACHE_SIZE;
extern const Duration CLOCK_SKEW_RETRY_TIMEOUT;
extern const SystemDuration CLOCK_SKEW_RETRY_TIMEOUT;
} // namespace util

2
platform/default/online_file_source.cpp
View File

@@ -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) {

2
src/mbgl/util/constants.cpp
View File

@@ -31,7 +31,7 @@ const double MAX_ZOOM = 25.5;
const uint64_t DEFAULT_MAX_CACHE_SIZE = 50 * 1024 * 1024;
const Duration CLOCK_SKEW_RETRY_TIMEOUT = Seconds(30);
const SystemDuration CLOCK_SKEW_RETRY_TIMEOUT = Seconds(30);
} // namespace util