diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-10-13 14:27:09 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-10-14 11:36:28 -0400 |
| commit | 62595a9b394547bffb8c2965b103bd87dd397e15 (patch) | |
| tree | d97215f2b66d01d6dffa4252b1aa26e76b90f08d /test | |
| parent | 5b9deae95709ea557f28e4a5dcbe3ac8fd47023e (diff) | |
| download | qtlocation-mapboxgl-62595a9b394547bffb8c2965b103bd87dd397e15.tar.gz | |
[core] bump libuv to 1.7.5 across all platforms
UV_ASYNC_PARAMS and UV_TIMER_PARAMS for libuv <= 0.10 compatibility
use st_mtim.tv_sec in libuv > 0.10.x
Diffstat (limited to 'test')
| -rw-r--r-- | test/storage/http_error.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/storage/http_error.cpp b/test/storage/http_error.cpp index be2811cd06..7edce61e5c 100644 --- a/test/storage/http_error.cpp +++ b/test/storage/http_error.cpp @@ -7,6 +7,12 @@ #include <cmath> +#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 +#define UV_TIMER_PARAMS uv_timer_t*, int +#else +#define UV_TIMER_PARAMS uv_timer_t* +#endif + TEST_F(Storage, HTTPError) { SCOPED_TEST(HTTPTemporaryError) SCOPED_TEST(HTTPConnectionError) @@ -15,7 +21,7 @@ TEST_F(Storage, HTTPError) { uv_timer_t statusChange; uv_timer_init(uv_default_loop(), &statusChange); - uv_timer_start(&statusChange, [](uv_timer_t *, int) { + uv_timer_start(&statusChange, [](UV_TIMER_PARAMS) { NetworkStatus::Reachable(); }, 500, 500); uv_unref((uv_handle_t *)&statusChange); |