diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-06-27 15:52:45 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-06-27 15:52:45 +0200 |
| commit | 6d9de7573202d4b2332667f2d685a0e73e7c0f52 (patch) | |
| tree | bce1907e03c9789a7160295859796b6416004d11 /include/llmr/style/style.hpp | |
| parent | 6de9d9769e601284347b73231d286dc645ee1b67 (diff) | |
| download | qtlocation-mapboxgl-6d9de7573202d4b2332667f2d685a0e73e7c0f52.tar.gz | |
rename time => timestamp to avoid naming conflicts
Diffstat (limited to 'include/llmr/style/style.hpp')
| -rw-r--r-- | include/llmr/style/style.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llmr/style/style.hpp b/include/llmr/style/style.hpp index 71e1997e7f..73ad6d6bd2 100644 --- a/include/llmr/style/style.hpp +++ b/include/llmr/style/style.hpp @@ -61,7 +61,7 @@ public: void cascade(float z); bool needsTransition() const; - void updateTransitions(time now); + void updateTransitions(timestamp now); void cancelTransitions(); void setDefaultTransitionDuration(uint64_t duration_milliseconds = 0); |