diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-01-23 14:47:17 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-01-25 15:11:18 +0200 |
commit | 2f86467586706d254fcbcb1c88657992214aefcd (patch) | |
tree | 97c34a7c1589ba32cc981b47792983d057c3b996 /test/fixtures | |
parent | cc47da5a15650c3f8ede9f7e253e4099dc61673f (diff) | |
download | qtlocation-mapboxgl-2f86467586706d254fcbcb1c88657992214aefcd.tar.gz |
Cleanup std::chrono usage
Use mbgl::Duration and mbgl::{,Milli}Seconds whenever possible.
Diffstat (limited to 'test/fixtures')
-rw-r--r-- | test/fixtures/mock_file_source.cpp | 3 | ||||
-rw-r--r-- | test/fixtures/util.cpp | 3 | ||||
-rw-r--r-- | test/fixtures/util.hpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/test/fixtures/mock_file_source.cpp b/test/fixtures/mock_file_source.cpp index 791e5d314a..078271a422 100644 --- a/test/fixtures/mock_file_source.cpp +++ b/test/fixtures/mock_file_source.cpp @@ -1,5 +1,6 @@ #include "mock_file_source.hpp" #include <mbgl/util/io.hpp> +#include <mbgl/util/chrono.hpp> namespace mbgl { @@ -18,7 +19,7 @@ public: MockFileSource::MockFileSource(Type type_, const std::string& match_) : type(type_), match(match_) { - timer.start(std::chrono::milliseconds(10), std::chrono::milliseconds(10), [this] { + timer.start(Milliseconds(10), Milliseconds(10), [this] { // Explicit move to avoid iterator invalidation if ~MockFileRequest gets called within the loop. auto pending_ = std::move(pending); for (auto& pair : pending_) { diff --git a/test/fixtures/util.cpp b/test/fixtures/util.cpp index c2a5d83637..fcb6abed4e 100644 --- a/test/fixtures/util.cpp +++ b/test/fixtures/util.cpp @@ -4,6 +4,7 @@ #include <mbgl/platform/log.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/io.hpp> +#include <mbgl/util/chrono.hpp> #include <mapbox/pixelmatch.hpp> @@ -105,7 +106,7 @@ uint64_t crc64(const PremultipliedImage &image) { return crc64(reinterpret_cast<const char*>(image.data.get()), image.size()); } -PremultipliedImage render(Map& map, std::chrono::milliseconds timeout) { +PremultipliedImage render(Map& map, Milliseconds timeout) { std::promise<PremultipliedImage> promise; map.renderStill([&](std::exception_ptr, PremultipliedImage&& image) { promise.set_value(std::move(image)); diff --git a/test/fixtures/util.hpp b/test/fixtures/util.hpp index 7a240cb41f..b93d822a83 100644 --- a/test/fixtures/util.hpp +++ b/test/fixtures/util.hpp @@ -2,6 +2,7 @@ #define MBGL_TEST_UTIL #include <mbgl/util/image.hpp> +#include <mbgl/util/chrono.hpp> #include <chrono> #include <cstdint> @@ -35,8 +36,7 @@ uint64_t crc64(const char*, size_t); uint64_t crc64(const std::string&); uint64_t crc64(const PremultipliedImage&); -PremultipliedImage render(Map&, - std::chrono::milliseconds timeout = std::chrono::milliseconds(1000)); +PremultipliedImage render(Map&, Milliseconds timeout = Milliseconds(1000)); void checkImage(const std::string& base, const PremultipliedImage& actual, |