diff options
Diffstat (limited to 'src/mbgl')
27 files changed, 33 insertions, 33 deletions
diff --git a/src/mbgl/algorithm/generate_clip_ids_impl.hpp b/src/mbgl/algorithm/generate_clip_ids_impl.hpp index 9b550fcbba..59ca66bf66 100644 --- a/src/mbgl/algorithm/generate_clip_ids_impl.hpp +++ b/src/mbgl/algorithm/generate_clip_ids_impl.hpp @@ -2,7 +2,7 @@ #include <mbgl/algorithm/generate_clip_ids.hpp> #include <mbgl/math/log2.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> namespace mbgl { namespace algorithm { diff --git a/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp index 1dfa42fc2c..71a855b943 100644 --- a/src/mbgl/geometry/line_atlas.cpp +++ b/src/mbgl/geometry/line_atlas.cpp @@ -1,7 +1,7 @@ #include <mbgl/geometry/line_atlas.hpp> #include <mbgl/gl/context.hpp> -#include <mbgl/platform/log.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/logging.hpp> +#include <mbgl/util/platform.hpp> #include <boost/functional/hash.hpp> diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp index 41e81a186f..4c469d7f67 100644 --- a/src/mbgl/gl/context.cpp +++ b/src/mbgl/gl/context.cpp @@ -4,7 +4,7 @@ #include <mbgl/gl/vertex_array.hpp> #include <mbgl/util/traits.hpp> #include <mbgl/util/std.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <cstring> diff --git a/src/mbgl/gl/debugging.cpp b/src/mbgl/gl/debugging.cpp index 1d82b6afb0..8037fc5ef5 100644 --- a/src/mbgl/gl/debugging.cpp +++ b/src/mbgl/gl/debugging.cpp @@ -2,8 +2,8 @@ #include <mbgl/gl/debugging.hpp> #include <mbgl/gl/gl.hpp> #include <mbgl/gl/extension.hpp> -#include <mbgl/platform/event.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/event.hpp> +#include <mbgl/util/logging.hpp> #define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index b18491bf78..41ad6f6452 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -17,8 +17,8 @@ #include <mbgl/math/clamp.hpp> #include <mbgl/math/minmax.hpp> #include <mbgl/math/log2.hpp> -#include <mbgl/platform/platform.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/platform.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/text/bidi.hpp> diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index eac7b596be..3b8758f987 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -23,7 +23,7 @@ #include <mbgl/util/mapbox.hpp> #include <mbgl/util/tile_coordinate.hpp> #include <mbgl/actor/scheduler.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/math/log2.hpp> namespace mbgl { diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index 7a3f4edf0e..ba5e205301 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -9,8 +9,8 @@ #include <mbgl/util/chrono.hpp> #include <mbgl/util/projection.hpp> #include <mbgl/math/clamp.hpp> -#include <mbgl/platform/log.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/logging.hpp> +#include <mbgl/util/platform.hpp> #include <cstdio> #include <cmath> diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp index 96e44d6903..b89e982057 100644 --- a/src/mbgl/renderer/fill_bucket.cpp +++ b/src/mbgl/renderer/fill_bucket.cpp @@ -2,7 +2,7 @@ #include <mbgl/style/layers/fill_layer.hpp> #include <mbgl/renderer/painter.hpp> #include <mbgl/programs/fill_program.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mapbox/earcut.hpp> diff --git a/src/mbgl/renderer/frame_history.hpp b/src/mbgl/renderer/frame_history.hpp index dfa2751038..fffbd113ed 100644 --- a/src/mbgl/renderer/frame_history.hpp +++ b/src/mbgl/renderer/frame_history.hpp @@ -2,7 +2,7 @@ #include <array> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> #include <mbgl/gl/texture.hpp> #include <mbgl/util/chrono.hpp> #include <mbgl/util/image.hpp> diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 2949cee1d9..be160187be 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -7,7 +7,7 @@ #include <mbgl/map/view.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/gl/debugging.hpp> #include <mbgl/style/style.hpp> diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index 24563ff43d..ea055ce5ec 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/src/mbgl/sprite/sprite_atlas.cpp @@ -2,8 +2,8 @@ #include <mbgl/sprite/sprite_atlas_observer.hpp> #include <mbgl/sprite/sprite_parser.hpp> #include <mbgl/gl/context.hpp> -#include <mbgl/platform/log.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/logging.hpp> +#include <mbgl/util/platform.hpp> #include <mbgl/util/math.hpp> #include <mbgl/util/std.hpp> #include <mbgl/util/constants.hpp> diff --git a/src/mbgl/sprite/sprite_parser.cpp b/src/mbgl/sprite/sprite_parser.cpp index 934dca14a8..9de8515e14 100644 --- a/src/mbgl/sprite/sprite_parser.cpp +++ b/src/mbgl/sprite/sprite_parser.cpp @@ -1,7 +1,7 @@ #include <mbgl/sprite/sprite_parser.hpp> #include <mbgl/sprite/sprite_image.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/rapidjson.hpp> diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp index 059082980d..c6c6e50dd7 100644 --- a/src/mbgl/style/parser.cpp +++ b/src/mbgl/style/parser.cpp @@ -5,7 +5,7 @@ #include <mbgl/style/conversion/source.hpp> #include <mbgl/style/conversion/layer.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mapbox/geojsonvt.hpp> diff --git a/src/mbgl/style/property_parsing.hpp b/src/mbgl/style/property_parsing.hpp index 8c2bd2c0f4..b542c8ae47 100644 --- a/src/mbgl/style/property_parsing.hpp +++ b/src/mbgl/style/property_parsing.hpp @@ -5,7 +5,7 @@ #include <mbgl/style/rapidjson_conversion.hpp> #include <mbgl/style/conversion/property_value.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> namespace mbgl { namespace style { diff --git a/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp index a1b495627c..18954dbfaa 100644 --- a/src/mbgl/style/source_impl.cpp +++ b/src/mbgl/style/source_impl.cpp @@ -6,7 +6,7 @@ #include <mbgl/style/update_parameters.hpp> #include <mbgl/style/query_parameters.hpp> #include <mbgl/text/placement_config.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/math/clamp.hpp> #include <mbgl/util/tile_cover.hpp> #include <mbgl/util/enum.hpp> diff --git a/src/mbgl/style/sources/geojson_source_impl.cpp b/src/mbgl/style/sources/geojson_source_impl.cpp index 4800b9c4be..7f41e0e321 100644 --- a/src/mbgl/style/sources/geojson_source_impl.cpp +++ b/src/mbgl/style/sources/geojson_source_impl.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/storage/file_source.hpp> #include <mbgl/style/conversion/geojson.hpp> #include <mbgl/style/source_observer.hpp> diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 6b80202093..867a03da79 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -26,7 +26,7 @@ #include <mbgl/renderer/render_tile.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/string.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/math/minmax.hpp> #include <algorithm> diff --git a/src/mbgl/text/glyph_atlas.cpp b/src/mbgl/text/glyph_atlas.cpp index 57b8b14017..5d30dacdce 100644 --- a/src/mbgl/text/glyph_atlas.cpp +++ b/src/mbgl/text/glyph_atlas.cpp @@ -2,8 +2,8 @@ #include <mbgl/text/glyph_atlas_observer.hpp> #include <mbgl/text/glyph_pbf.hpp> #include <mbgl/gl/context.hpp> -#include <mbgl/platform/log.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/logging.hpp> +#include <mbgl/util/platform.hpp> #include <cassert> #include <algorithm> diff --git a/src/mbgl/text/glyph_set.cpp b/src/mbgl/text/glyph_set.cpp index 67c2ab93e4..ef556aa537 100644 --- a/src/mbgl/text/glyph_set.cpp +++ b/src/mbgl/text/glyph_set.cpp @@ -1,5 +1,5 @@ #include <mbgl/text/glyph_set.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/math/minmax.hpp> #include <mbgl/util/i18n.hpp> #include <mbgl/text/bidi.hpp> diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp index abb3894d34..738c78572d 100644 --- a/src/mbgl/tile/geometry_tile_worker.cpp +++ b/src/mbgl/tile/geometry_tile_worker.cpp @@ -8,7 +8,7 @@ #include <mbgl/style/layers/symbol_layer.hpp> #include <mbgl/style/layers/symbol_layer_impl.hpp> #include <mbgl/renderer/symbol_bucket.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/exception.hpp> diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp index 1375263107..e84eaaf780 100644 --- a/src/mbgl/tile/tile.cpp +++ b/src/mbgl/tile/tile.cpp @@ -2,7 +2,7 @@ #include <mbgl/tile/tile_observer.hpp> #include <mbgl/renderer/debug_bucket.hpp> #include <mbgl/util/string.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> namespace mbgl { diff --git a/src/mbgl/platform/event.cpp b/src/mbgl/util/event.cpp index 68d75a2941..3a3be20f5c 100644 --- a/src/mbgl/platform/event.cpp +++ b/src/mbgl/util/event.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/event.hpp> +#include <mbgl/util/event.hpp> #include <mbgl/util/enum.hpp> namespace mbgl { diff --git a/src/mbgl/platform/log.cpp b/src/mbgl/util/logging.cpp index b140485dd6..939f1def64 100644 --- a/src/mbgl/platform/log.cpp +++ b/src/mbgl/util/logging.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/enum.hpp> #include <mbgl/util/thread.hpp> diff --git a/src/mbgl/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp index 89f6a55167..839924d77c 100644 --- a/src/mbgl/util/mapbox.cpp +++ b/src/mbgl/util/mapbox.cpp @@ -1,6 +1,6 @@ #include <mbgl/util/mapbox.hpp> #include <mbgl/util/constants.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <stdexcept> #include <vector> diff --git a/src/mbgl/util/stopwatch.cpp b/src/mbgl/util/stopwatch.cpp index d588b79254..3883d8535f 100644 --- a/src/mbgl/util/stopwatch.cpp +++ b/src/mbgl/util/stopwatch.cpp @@ -2,7 +2,7 @@ #include <mbgl/util/stopwatch.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/chrono.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <iostream> #include <atomic> diff --git a/src/mbgl/util/stopwatch.hpp b/src/mbgl/util/stopwatch.hpp index 74cc2c412d..6214dae958 100644 --- a/src/mbgl/util/stopwatch.hpp +++ b/src/mbgl/util/stopwatch.hpp @@ -1,6 +1,6 @@ #pragma once -#include <mbgl/platform/event.hpp> +#include <mbgl/util/event.hpp> #include <mbgl/util/chrono.hpp> #include <string> diff --git a/src/mbgl/util/thread.hpp b/src/mbgl/util/thread.hpp index 91eef745fa..8cfef8a764 100644 --- a/src/mbgl/util/thread.hpp +++ b/src/mbgl/util/thread.hpp @@ -8,7 +8,7 @@ #include <mbgl/util/run_loop.hpp> #include <mbgl/util/thread_context.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> #include <pthread.h> |