Add typedefs for std::chrono::steady_clock types

5 files changed, 45 insertions, 29 deletions

diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp
index 62446bf15a..21784f5315 100644
--- a/include/mbgl/android/native_map_view.hpp
+++ b/include/mbgl/android/native_map_view.hpp
@@ -25,7 +25,7 @@ public:
     void notify() override;
     void invalidate() override;
 
-    void notifyMapChange(mbgl::MapChange change, std::chrono::steady_clock::duration delay = std::chrono::steady_clock::duration::zero()) override;
+    void notifyMapChange(mbgl::MapChange change, Duration delay = Duration::zero()) override;
 
     mbgl::Map &getMap();
     mbgl::DefaultFileSource &getFileSource();
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index cd280d0247..83bb055214 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -2,6 +2,7 @@
 #define MBGL_MAP_MAP
 
 #include <mbgl/map/transform.hpp>
+#include <mbgl/util/chrono.hpp>
 #include <mbgl/util/geo.hpp>
 #include <mbgl/util/projection.hpp>
 #include <mbgl/util/noncopyable.hpp>
@@ -19,7 +20,6 @@
 #include <mutex>
 #include <condition_variable>
 #include <functional>
-#include <chrono>
 
 namespace mbgl {
 
@@ -99,8 +99,8 @@ public:
     void setClasses(const std::vector<std::string>&);
     std::vector<std::string> getClasses() const;
 
-    void setDefaultTransitionDuration(std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    std::chrono::steady_clock::duration getDefaultTransitionDuration();
+    void setDefaultTransitionDuration(Duration = Duration::zero());
+    Duration getDefaultTransitionDuration();
     void setStyleURL(const std::string& url);
     void setStyleJSON(const std::string& json, const std::string& base = "");
     std::string getStyleJSON() const;
@@ -109,20 +109,20 @@ public:
     void cancelTransitions();
 
     // Position
-    void moveBy(double dx, double dy, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void setLatLng(LatLng latLng, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void moveBy(double dx, double dy, Duration = Duration::zero());
+    void setLatLng(LatLng latLng, Duration = Duration::zero());
     LatLng getLatLng() const;
     void startPanning();
     void stopPanning();
     void resetPosition();
 
     // Scale
-    void scaleBy(double ds, double cx = -1, double cy = -1, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void setScale(double scale, double cx = -1, double cy = -1, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void scaleBy(double ds, double cx = -1, double cy = -1, Duration = Duration::zero());
+    void setScale(double scale, double cx = -1, double cy = -1, Duration = Duration::zero());
     double getScale() const;
-    void setZoom(double zoom, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void setZoom(double zoom, Duration = Duration::zero());
     double getZoom() const;
-    void setLatLngZoom(LatLng latLng, double zoom, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void setLatLngZoom(LatLng latLng, double zoom, Duration = Duration::zero());
     void resetZoom();
     void startScaling();
     void stopScaling();
@@ -130,8 +130,8 @@ public:
     double getMaxZoom() const;
 
     // Rotation
-    void rotateBy(double sx, double sy, double ex, double ey, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void setBearing(double degrees, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void rotateBy(double sx, double sy, double ex, double ey, Duration = Duration::zero());
+    void setBearing(double degrees, Duration = Duration::zero());
     void setBearing(double degrees, double cx, double cy);
     double getBearing() const;
     void resetNorth();
@@ -168,7 +168,7 @@ public:
     bool getDebug() const;
 
     inline const TransformState &getState() const { return state; }
-    std::chrono::steady_clock::time_point getTime() const;
+    TimePoint getTime() const;
     inline AnnotationManager& getAnnotationManager() const { return *annotationManager; }
 
 private:
diff --git a/include/mbgl/map/transform.hpp b/include/mbgl/map/transform.hpp
index 94bea11a45..b15c119c44 100644
--- a/include/mbgl/map/transform.hpp
+++ b/include/mbgl/map/transform.hpp
@@ -2,6 +2,7 @@
 #define MBGL_MAP_TRANSFORM
 
 #include <mbgl/map/transform_state.hpp>
+#include <mbgl/util/chrono.hpp>
 #include <mbgl/util/geo.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/vec.hpp>
@@ -10,7 +11,6 @@
 #include <cmath>
 #include <forward_list>
 #include <mutex>
-#include <chrono>
 
 namespace mbgl {
 
@@ -27,17 +27,17 @@ public:
                 uint16_t fb_width, uint16_t fb_height);
 
     // Position
-    void moveBy(double dx, double dy, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void setLatLng(LatLng latLng, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void setLatLngZoom(LatLng latLng, double zoom, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void moveBy(double dx, double dy, Duration = Duration::zero());
+    void setLatLng(LatLng latLng, Duration = Duration::zero());
+    void setLatLngZoom(LatLng latLng, double zoom, Duration = Duration::zero());
     inline const LatLng getLatLng() const { return current.getLatLng(); }
     void startPanning();
     void stopPanning();
 
     // Zoom
-    void scaleBy(double ds, double cx = -1, double cy = -1, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void setScale(double scale, double cx = -1, double cy = -1, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void setZoom(double zoom, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void scaleBy(double ds, double cx = -1, double cy = -1, Duration = Duration::zero());
+    void setScale(double scale, double cx = -1, double cy = -1, Duration = Duration::zero());
+    void setZoom(double zoom, Duration = Duration::zero());
     double getZoom() const;
     double getScale() const;
     void startScaling();
@@ -46,8 +46,8 @@ public:
     double getMaxZoom() const;
 
     // Angle
-    void rotateBy(double sx, double sy, double ex, double ey, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void setAngle(double angle, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void rotateBy(double sx, double sy, double ex, double ey, Duration = Duration::zero());
+    void setAngle(double angle, Duration = Duration::zero());
     void setAngle(double angle, double cx, double cy);
     double getAngle() const;
     void startRotating();
@@ -55,7 +55,7 @@ public:
 
     // Transitions
     bool needsTransition() const;
-    void updateTransitions(std::chrono::steady_clock::time_point now);
+    void updateTransitions(TimePoint now);
     void cancelTransitions();
 
     // Transform state
@@ -65,10 +65,10 @@ public:
 private:
     // Functions prefixed with underscores will *not* perform any locks. It is the caller's
     // responsibility to lock this object.
-    void _moveBy(double dx, double dy, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void _setScale(double scale, double cx, double cy, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void _setScaleXY(double new_scale, double xn, double yn, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
-    void _setAngle(double angle, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void _moveBy(double dx, double dy, Duration = Duration::zero());
+    void _setScale(double scale, double cx, double cy, Duration = Duration::zero());
+    void _setScaleXY(double new_scale, double xn, double yn, Duration = Duration::zero());
+    void _setAngle(double angle, Duration = Duration::zero());
     void _clearPanning();
     void _clearRotating();
     void _clearScaling();
diff --git a/include/mbgl/map/view.hpp b/include/mbgl/map/view.hpp
index bcfeb62cfc..9b29227d8b 100644
--- a/include/mbgl/map/view.hpp
+++ b/include/mbgl/map/view.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_MAP_VIEW
 #define MBGL_MAP_VIEW
 
-#include <chrono>
+#include <mbgl/util/chrono.hpp>
 
 namespace mbgl {
 
@@ -45,7 +45,7 @@ public:
     // Must not be called from the render thread.
     virtual void notifyMapChange(
         MapChange change,
-        std::chrono::steady_clock::duration delay = std::chrono::steady_clock::duration::zero());
+        Duration delay = Duration::zero());
 
 protected:
     // Resizes the view
diff --git a/include/mbgl/util/chrono.hpp b/include/mbgl/util/chrono.hpp
new file mode 100644
index 0000000000..df8c5e6234
--- /dev/null
+++ b/include/mbgl/util/chrono.hpp
@@ -0,0 +1,16 @@
+#ifndef MBGL_UTIL_CHRONO
+#define MBGL_UTIL_CHRONO
+
+#include <chrono>
+
+namespace mbgl {
+
+using Clock = std::chrono::steady_clock;
+using SystemClock = std::chrono::system_clock;
+
+using TimePoint = Clock::time_point;
+using Duration  = Clock::duration;
+
+}
+
+#endif