diff options
| author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-08-22 16:56:32 +0200 |
|---|---|---|
| committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-08-22 16:56:32 +0200 |
| commit | 797f622a26b34db5a30e7f1728d87c6700a2ec1e (patch) | |
| tree | 75ea93979db2baf3eb2234c6fbb3d1a9c5b70329 /src/mbgl/style/conversion/json.hpp | |
| parent | 86fc3f525e42d042f239876b93525ff411ad7182 (diff) | |
| parent | 520df7f02049cdbbb9e68041e755d6c3a8d5b21f (diff) | |
| download | qtlocation-mapboxgl-797f622a26b34db5a30e7f1728d87c6700a2ec1e.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into bwg-vs2017
Diffstat (limited to 'src/mbgl/style/conversion/json.hpp')
| -rw-r--r-- | src/mbgl/style/conversion/json.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/style/conversion/json.hpp b/src/mbgl/style/conversion/json.hpp index 7dd2378f6b..3a7bf2b557 100644 --- a/src/mbgl/style/conversion/json.hpp +++ b/src/mbgl/style/conversion/json.hpp @@ -1,4 +1,6 @@ -#include <mbgl/style/conversion.hpp> +#pragma once + +#include <mbgl/style/conversion_impl.hpp> #include <mbgl/style/rapidjson_conversion.hpp> #include <string> |