From 9331acf8e68e428e70c1f73ccb90147e71c586fd Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 1 Apr 2015 14:05:37 -0700 Subject: Add typedefs for std::chrono::steady_clock types --- include/mbgl/android/native_map_view.hpp | 2 +- include/mbgl/map/map.hpp | 24 ++++++++++++------------ include/mbgl/map/transform.hpp | 28 ++++++++++++++-------------- include/mbgl/map/view.hpp | 4 ++-- include/mbgl/util/chrono.hpp | 16 ++++++++++++++++ 5 files changed, 45 insertions(+), 29 deletions(-) create mode 100644 include/mbgl/util/chrono.hpp (limited to 'include') 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 +#include #include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include namespace mbgl { @@ -99,8 +99,8 @@ public: void setClasses(const std::vector&); std::vector 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 +#include #include #include #include @@ -10,7 +11,6 @@ #include #include #include -#include 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 +#include 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 + +namespace mbgl { + +using Clock = std::chrono::steady_clock; +using SystemClock = std::chrono::system_clock; + +using TimePoint = Clock::time_point; +using Duration = Clock::duration; + +} + +#endif -- cgit v1.2.1