summaryrefslogtreecommitdiff
path: root/src/mbgl/style/style.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-04-01 14:05:37 -0700
committerKonstantin Käfer <mail@kkaefer.com>2015-04-02 12:28:12 +0200
commit9331acf8e68e428e70c1f73ccb90147e71c586fd (patch)
treedf0d36b3192e96f11817ca9caa490e7075a96eeb /src/mbgl/style/style.cpp
parent440864063e916e92eed1b1fe15453e067cbf2781 (diff)
downloadqtlocation-mapboxgl-9331acf8e68e428e70c1f73ccb90147e71c586fd.tar.gz
Add typedefs for std::chrono::steady_clock types
Diffstat (limited to 'src/mbgl/style/style.cpp')
-rw-r--r--src/mbgl/style/style.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index d0adfe27c2..4923e59da4 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -26,14 +26,14 @@ Style::Style()
Style::~Style() {}
void Style::cascade(const std::vector<std::string>& classes) {
- std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+ TimePoint now = Clock::now();
for (const auto& layer : layers) {
layer->setClasses(classes, now, defaultTransition);
}
}
-void Style::recalculate(float z, std::chrono::steady_clock::time_point now) {
+void Style::recalculate(float z, TimePoint now) {
uv::writelock lock(mtx);
zoomHistory.update(z, now);
@@ -47,7 +47,7 @@ const std::string &Style::getSpriteURL() const {
return sprite_url;
}
-void Style::setDefaultTransitionDuration(std::chrono::steady_clock::duration duration) {
+void Style::setDefaultTransitionDuration(Duration duration) {
defaultTransition.duration = duration;
}