diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-05 16:31:03 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-08 13:48:57 -0700 |
| commit | baaae99a03202641ae5b8024e57b691fe61a6688 (patch) | |
| tree | 459045e56197696aa1312594f1e452b03931775d /cmake/test-files.cmake | |
| parent | e34d8b5c802186008e49364668e4a7bd5668d0fd (diff) | |
| download | qtlocation-mapboxgl-baaae99a03202641ae5b8024e57b691fe61a6688.tar.gz | |
[core, android] Factor JSON string conversions
This adds a `convertJSON` template, to be used like:
Error error
optional<Foo> foo = convertJSON<Foo>(string, error);
Internally, it parses the string with RapidJSON and then calls `convert<Foo>(parsed, error)`.
While here, rationalize GeoJSON converters and fix error handling for Tileset conversion in OfflineDownload.
Diffstat (limited to 'cmake/test-files.cmake')
| -rw-r--r-- | cmake/test-files.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 51dedb0052..6026374de6 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -59,6 +59,7 @@ set(MBGL_TEST_FILES test/src/mbgl/test/stub_file_source.hpp test/src/mbgl/test/stub_geometry_tile_feature.hpp test/src/mbgl/test/stub_layer_observer.hpp + test/src/mbgl/test/stub_render_source_observer.hpp test/src/mbgl/test/stub_style_observer.hpp test/src/mbgl/test/stub_tile_observer.hpp test/src/mbgl/test/test.cpp @@ -100,7 +101,6 @@ set(MBGL_TEST_FILES test/style/style_image.test.cpp test/style/style_layer.test.cpp test/style/style_parser.test.cpp - test/style/tile_source.test.cpp # text test/text/glyph_atlas.test.cpp |