[core] Build fix

Fix no viable conversion on OSX.
mapbox · Feb 26, 2016 · f683b10 · f683b10
1 parent c8b7066
commit f683b10
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp
@@ -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
 

diff --git 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) {

diff --git a/src/mbgl/util/constants.cpp b/src/mbgl/util/constants.cpp
@@ -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