diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-01-19 17:40:24 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 10:49:05 +0100 |
| commit | 31a0d18ca1961b1cfb0785a1921b1f093167ebda (patch) | |
| tree | 412b555337be9ccb5cc4832a49cb85a48690c1d4 /test | |
| parent | 5602ba2f07a893604ea0506b3d580d4f2e2999ae (diff) | |
| download | qtlocation-mapboxgl-31a0d18ca1961b1cfb0785a1921b1f093167ebda.tar.gz | |
remove circular shared_ptr and a few other memory leaks
Diffstat (limited to 'test')
| -rw-r--r-- | test/headless.cpp | 4 | ||||
| -rw-r--r-- | test/test.gyp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/headless.cpp b/test/headless.cpp index 7d18ca451e..c39e5b74a0 100644 --- a/test/headless.cpp +++ b/test/headless.cpp @@ -11,7 +11,7 @@ #include <mbgl/platform/default/headless_view.hpp> #include <mbgl/platform/default/headless_display.hpp> -#include <mbgl/storage/caching_http_file_source.hpp> +#include <mbgl/storage/default/default_file_source.hpp> #include "./fixtures/fixture_log.hpp" @@ -191,7 +191,7 @@ TEST_P(HeadlessTest, render) { } HeadlessView view(env->display); - CachingHTTPFileSource fileSource(platform::defaultCacheDatabase()); + mbgl::DefaultFileSource fileSource(nullptr); Map map(view, fileSource); map.setClasses(classes); diff --git a/test/test.gyp b/test/test.gyp index 406e0b23a7..85958b1f03 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -8,6 +8,7 @@ 'ldflags': [ '<@(uv_ldflags)', '<@(sqlite3_static_libs)', + '<@(uv_static_libs)', '<@(sqlite3_ldflags)', '<@(curl_ldflags)', '<@(png_ldflags)', @@ -210,7 +211,7 @@ ], 'dependencies': [ '../deps/gtest/gtest.gyp:gtest', - '../mapboxgl.gyp:mbgl-standalone', + '../mapboxgl.gyp:mbgl-core', '../mapboxgl.gyp:mbgl-headless', '<(platform_library)', ], |