rename time => timestamp to avoid naming conflicts

This commit is contained in:
Konstantin Käfer
2014-06-27 15:52:45 +02:00
parent 6de9d9769e
commit 6d9de75732
15 changed files with 79 additions and 79 deletions

View File

@@ -47,8 +47,8 @@ void Painter::renderText(TextBucket& bucket, std::shared_ptr<StyleLayer> layer_d
textShader->setZoom((map.getState().getNormalizedZoom() - zoomAdjust) * 10); // current zoom level
// Label fading
const time duration = 300_milliseconds;
const time currentTime = util::now();
const timestamp duration = 300_milliseconds;
const timestamp currentTime = util::now();
std::deque<FrameSnapshot> &history = frameHistory.history;