[build] move logging to util
This commit is contained in:
@@ -130,13 +130,6 @@ set(MBGL_CORE_FILES
|
||||
src/parsedate/parsedate.c
|
||||
src/parsedate/parsedate.h
|
||||
|
||||
# platform
|
||||
include/mbgl/platform/event.hpp
|
||||
include/mbgl/platform/log.hpp
|
||||
include/mbgl/platform/platform.hpp
|
||||
src/mbgl/platform/event.cpp
|
||||
src/mbgl/platform/log.cpp
|
||||
|
||||
# programs
|
||||
src/mbgl/programs/attributes.hpp
|
||||
src/mbgl/programs/circle_program.cpp
|
||||
@@ -386,6 +379,7 @@ set(MBGL_CORE_FILES
|
||||
include/mbgl/util/constants.hpp
|
||||
include/mbgl/util/convert.hpp
|
||||
include/mbgl/util/enum.hpp
|
||||
include/mbgl/util/event.hpp
|
||||
include/mbgl/util/exception.hpp
|
||||
include/mbgl/util/feature.hpp
|
||||
include/mbgl/util/font_stack.hpp
|
||||
@@ -393,8 +387,10 @@ set(MBGL_CORE_FILES
|
||||
include/mbgl/util/geojson.hpp
|
||||
include/mbgl/util/geometry.hpp
|
||||
include/mbgl/util/image.hpp
|
||||
include/mbgl/util/logging.hpp
|
||||
include/mbgl/util/noncopyable.hpp
|
||||
include/mbgl/util/optional.hpp
|
||||
include/mbgl/util/platform.hpp
|
||||
include/mbgl/util/projection.hpp
|
||||
include/mbgl/util/range.hpp
|
||||
include/mbgl/util/run_loop.hpp
|
||||
@@ -419,6 +415,7 @@ set(MBGL_CORE_FILES
|
||||
src/mbgl/util/convert.cpp
|
||||
src/mbgl/util/dtoa.cpp
|
||||
src/mbgl/util/dtoa.hpp
|
||||
src/mbgl/util/event.cpp
|
||||
src/mbgl/util/exclusive.hpp
|
||||
src/mbgl/util/font_stack.cpp
|
||||
src/mbgl/util/geo.cpp
|
||||
@@ -438,6 +435,7 @@ set(MBGL_CORE_FILES
|
||||
src/mbgl/util/intersection_tests.hpp
|
||||
src/mbgl/util/io.cpp
|
||||
src/mbgl/util/io.hpp
|
||||
src/mbgl/util/logging.cpp
|
||||
src/mbgl/util/mapbox.cpp
|
||||
src/mbgl/util/mapbox.hpp
|
||||
src/mbgl/util/mat2.cpp
|
||||
|
||||
@@ -3,8 +3,8 @@ add_nodejs_module(mbgl-node
|
||||
)
|
||||
|
||||
target_sources(mbgl-node
|
||||
PRIVATE platform/node/src/node_log.hpp
|
||||
PRIVATE platform/node/src/node_log.cpp
|
||||
PRIVATE platform/node/src/node_logging.hpp
|
||||
PRIVATE platform/node/src/node_logging.cpp
|
||||
PRIVATE platform/node/src/node_map.hpp
|
||||
PRIVATE platform/node/src/node_map.cpp
|
||||
PRIVATE platform/node/src/node_request.hpp
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/platform/event.hpp>
|
||||
#include <mbgl/util/event.hpp>
|
||||
|
||||
#include <mbgl/util/noncopyable.hpp>
|
||||
|
||||
@@ -44,7 +44,7 @@ macro(mbgl_platform_core)
|
||||
PRIVATE platform/default/sqlite3.hpp
|
||||
|
||||
# Misc
|
||||
PRIVATE platform/android/src/log_android.cpp
|
||||
PRIVATE platform/android/src/logging_android.cpp
|
||||
PRIVATE platform/default/string_stdlib.cpp
|
||||
|
||||
# Image handling
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "connectivity_listener.hpp"
|
||||
|
||||
#include <mbgl/storage/network_status.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <jni.h>
|
||||
#include <GLES2/gl2.h>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <mbgl/style/layers/custom_layer.hpp>
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <vector>
|
||||
#include <sstream>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace android {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <mbgl/storage/http_file_source.hpp>
|
||||
#include <mbgl/storage/resource.hpp>
|
||||
#include <mbgl/storage/response.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <mbgl/util/async_task.hpp>
|
||||
#include <mbgl/util/util.hpp>
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
#include <mbgl/style/layer.hpp>
|
||||
#include <mbgl/style/source.hpp>
|
||||
#include <mbgl/sprite/sprite_image.hpp>
|
||||
#include <mbgl/platform/event.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/event.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/storage/network_status.hpp>
|
||||
#include <mbgl/util/exception.hpp>
|
||||
#include <mbgl/util/optional.hpp>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <android/log.h>
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
#include <sys/system_properties.h>
|
||||
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/platform/event.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
#include <mbgl/util/event.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/gl/extension.hpp>
|
||||
#include <mbgl/gl/context.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "run_loop_impl.hpp"
|
||||
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
#include <mbgl/util/thread_context.hpp>
|
||||
#include <mbgl/util/thread_local.hpp>
|
||||
#include <mbgl/util/timer.hpp>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "value.hpp"
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/style/conversion.hpp>
|
||||
#include <mbgl/util/feature.hpp>
|
||||
#include <mbgl/util/optional.hpp>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <mbgl/style/conversion.hpp>
|
||||
#include <mbgl/style/conversion/geojson.hpp>
|
||||
#include <mbgl/util/rapidjson.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace android {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
//Java -> C++ conversion
|
||||
#include <mbgl/style/conversion.hpp>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
//Java -> C++ conversion
|
||||
#include <mbgl/style/conversion.hpp>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
|
||||
#include <sys/prctl.h>
|
||||
#include <sys/resource.h>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/enum.hpp>
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
@@ -1,6 +1,6 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
namespace platform {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <mbgl/storage/offline_database.hpp>
|
||||
#include <mbgl/storage/offline_download.hpp>
|
||||
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
#include <mbgl/util/url.hpp>
|
||||
#include <mbgl/util/thread.hpp>
|
||||
#include <mbgl/util/work_request.hpp>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <mbgl/gl/headless_backend.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <GL/osmesa.h>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <mbgl/storage/http_file_source.hpp>
|
||||
#include <mbgl/storage/resource.hpp>
|
||||
#include <mbgl/storage/response.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <mbgl/util/util.hpp>
|
||||
#include <mbgl/util/optional.hpp>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/enum.hpp>
|
||||
|
||||
#include <iostream>
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <mbgl/util/io.hpp>
|
||||
#include <mbgl/util/string.hpp>
|
||||
#include <mbgl/util/chrono.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include "sqlite3.hpp"
|
||||
#include <sqlite3.h>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <mbgl/storage/network_status.hpp>
|
||||
|
||||
#include <mbgl/storage/response.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#include <mbgl/util/thread.hpp>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <mbgl/util/image.hpp>
|
||||
#include <mbgl/util/premultiply.hpp>
|
||||
#include <mbgl/util/char_array_buffer.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <istream>
|
||||
#include <sstream>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <chrono>
|
||||
#include <experimental/optional>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
namespace mapbox {
|
||||
namespace sqlite {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
#define NU_WITH_TOUPPER
|
||||
#define NU_WITH_TOLOWER
|
||||
#define NU_WITH_UTF8_WRITER
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <mbgl/util/image.hpp>
|
||||
#include <mbgl/util/premultiply.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
#include <mbgl/gl/gl.hpp>
|
||||
#include <mbgl/gl/extension.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/string.hpp>
|
||||
#include <mbgl/util/chrono.hpp>
|
||||
#include <mbgl/map/camera.hpp>
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include "settings_json.hpp"
|
||||
|
||||
#include <mbgl/util/default_styles.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
#include <mbgl/util/default_thread_pool.hpp>
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ macro(mbgl_platform_core)
|
||||
# Misc
|
||||
PRIVATE platform/darwin/mbgl/storage/reachability.h
|
||||
PRIVATE platform/darwin/mbgl/storage/reachability.m
|
||||
PRIVATE platform/darwin/src/log_nslog.mm
|
||||
PRIVATE platform/darwin/src/logging_nslog.mm
|
||||
PRIVATE platform/darwin/src/nsthread.mm
|
||||
PRIVATE platform/darwin/src/string_nsstring.mm
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#import "MGLMapView_Private.h"
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/gl/extension.hpp>
|
||||
#include <mbgl/gl/context.hpp>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <mbgl/sprite/sprite_image.hpp>
|
||||
#include <mbgl/map/camera.hpp>
|
||||
#include <mbgl/map/mode.hpp>
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
#include <mbgl/storage/reachability.h>
|
||||
#include <mbgl/util/default_thread_pool.hpp>
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
|
||||
@@ -67,7 +67,7 @@ macro(mbgl_platform_core)
|
||||
PRIVATE platform/default/sqlite3.hpp
|
||||
|
||||
# Misc
|
||||
PRIVATE platform/default/log_stderr.cpp
|
||||
PRIVATE platform/default/logging_stderr.cpp
|
||||
PRIVATE platform/default/string_stdlib.cpp
|
||||
PRIVATE platform/default/thread.cpp
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <mbgl/gl/headless_backend.hpp>
|
||||
#include <mbgl/gl/headless_display.hpp>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <EGL/egl.h>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <mbgl/gl/headless_backend.hpp>
|
||||
#include <mbgl/gl/headless_display.hpp>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <cassert>
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <mbgl/gl/headless_display.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/string.hpp>
|
||||
|
||||
#include <EGL/egl.h>
|
||||
|
||||
@@ -34,7 +34,7 @@ macro(mbgl_platform_core)
|
||||
# Misc
|
||||
PRIVATE platform/darwin/mbgl/storage/reachability.h
|
||||
PRIVATE platform/darwin/mbgl/storage/reachability.m
|
||||
PRIVATE platform/darwin/src/log_nslog.mm
|
||||
PRIVATE platform/darwin/src/logging_nslog.mm
|
||||
PRIVATE platform/darwin/src/nsthread.mm
|
||||
PRIVATE platform/darwin/src/string_nsstring.mm
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "node_log.hpp"
|
||||
#include "node_logging.hpp"
|
||||
|
||||
#include <mbgl/util/enum.hpp>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "util/async_queue.hpp"
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
#include "node_map.hpp"
|
||||
#include "node_log.hpp"
|
||||
#include "node_logging.hpp"
|
||||
#include "node_request.hpp"
|
||||
|
||||
void RegisterModule(v8::Local<v8::Object> target, v8::Local<v8::Object> module) {
|
||||
|
||||
@@ -28,7 +28,7 @@ set(MBGL_QT_FILES
|
||||
PRIVATE platform/default/sqlite3.hpp
|
||||
|
||||
# Misc
|
||||
PRIVATE platform/default/log_stderr.cpp
|
||||
PRIVATE platform/default/logging_stderr.cpp
|
||||
|
||||
# Thread pool
|
||||
PRIVATE platform/default/mbgl/util/default_thread_pool.cpp
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "http_file_source.hpp"
|
||||
#include "http_request.hpp"
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QDir>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/async_task.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QString>
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <mbgl/platform/event.hpp>
|
||||
#include <mbgl/util/event.hpp>
|
||||
#include <mbgl/util/enum.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/enum.hpp>
|
||||
#include <mbgl/util/thread.hpp>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/platform/event.hpp>
|
||||
#include <mbgl/util/event.hpp>
|
||||
#include <mbgl/util/chrono.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <vector>
|
||||
#include <cstdarg>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <mbgl/map/map.hpp>
|
||||
#include <mbgl/gl/offscreen_view.hpp>
|
||||
#include <mbgl/gl/headless_display.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/image.hpp>
|
||||
#include <mbgl/util/io.hpp>
|
||||
#include <mbgl/util/chrono.hpp>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <mbgl/storage/asset_file_source.hpp>
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
#include <mbgl/util/chrono.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
#include <mbgl/util/thread.hpp>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <mbgl/storage/local_file_source.hpp>
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <mbgl/style/conversion/geojson_options.hpp>
|
||||
#include <mbgl/test/conversion_stubs.hpp>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
using namespace mbgl::style;
|
||||
using namespace mbgl::style::conversion;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <mbgl/util/io.hpp>
|
||||
#include <mbgl/util/tileset.hpp>
|
||||
#include <mbgl/util/default_thread_pool.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
#include <mbgl/map/transform.hpp>
|
||||
#include <mbgl/style/style.hpp>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
#include <mbgl/util/string.hpp>
|
||||
#include <mbgl/util/io.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <mbgl/test/util.hpp>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/http_timeout.hpp>
|
||||
#include <regex>
|
||||
#include <iostream>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <mbgl/test/util.hpp>
|
||||
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/mapbox.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#include <regex>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#include <mbgl/test/util.hpp>
|
||||
|
||||
#include <mbgl/util/utf.hpp>
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/platform.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user