From f683b10e106e7376322b9c67c2baf57f5022cec2 Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Fri, 26 Feb 2016 04:10:18 +0200
Subject: [PATCH] [core] Build fix

Fix no viable conversion on OSX.
---
 include/mbgl/util/constants.hpp         | 2 +-
 platform/default/online_file_source.cpp | 2 +-
 src/mbgl/util/constants.cpp             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp
index 480020f2ca5..fef68fcf8c7 100644
--- 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
index f6a971319d3..a39aee35a15 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) {
diff --git a/src/mbgl/util/constants.cpp b/src/mbgl/util/constants.cpp
index 9b3c110836a..85f9856a3a5 100644
--- 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