diff --git a/benchmark/api/query.benchmark.cpp b/benchmark/api/query.benchmark.cpp index f9f6d3eab..dce878ea6 100644 --- a/benchmark/api/query.benchmark.cpp +++ b/benchmark/api/query.benchmark.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/bin/render.cpp b/bin/render.cpp index 22668e2dc..c0348af75 100644 --- a/bin/render.cpp +++ b/bin/render.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #pragma GCC diagnostic push diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index c4a28524b..a49b8e534 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -141,7 +141,6 @@ set(MBGL_CORE_FILES include/mbgl/platform/default/headless_backend.hpp include/mbgl/platform/default/headless_display.hpp include/mbgl/platform/default/offscreen_view.hpp - include/mbgl/platform/default/thread_pool.hpp # programs src/mbgl/programs/attributes.hpp diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 1af81d684..5e37d13e6 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -56,11 +56,12 @@ macro(mbgl_platform_core) # TODO # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) target_include_directories(mbgl-core - PRIVATE platform/default + PUBLIC platform/default ) target_add_mason_package(mbgl-core PUBLIC sqlite) diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index 14b9842c7..35c030753 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/platform/default/thread_pool.cpp b/platform/default/mbgl/util/default_thread_pool.cpp similarity index 95% rename from platform/default/thread_pool.cpp rename to platform/default/mbgl/util/default_thread_pool.cpp index b7e02db15..92c0f0674 100644 --- a/platform/default/thread_pool.cpp +++ b/platform/default/mbgl/util/default_thread_pool.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace mbgl { diff --git a/include/mbgl/platform/default/thread_pool.hpp b/platform/default/mbgl/util/default_thread_pool.hpp similarity index 100% rename from include/mbgl/platform/default/thread_pool.hpp rename to platform/default/mbgl/util/default_thread_pool.hpp diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp index 6e4b324c4..e3c36dfbb 100644 --- a/platform/glfw/main.cpp +++ b/platform/glfw/main.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index a24d70fd8..56cb5344a 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -48,7 +48,8 @@ macro(mbgl_platform_core) PRIVATE platform/default/offscreen_view.cpp # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) target_add_mason_package(mbgl-core PUBLIC geojson) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 45ff2f826..be4e25b46 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 94830e6d2..312577a18 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -82,7 +82,8 @@ macro(mbgl_platform_core) PRIVATE platform/default/offscreen_view.cpp # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) target_include_directories(mbgl-core diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index b608d3b2d..13b434117 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -48,7 +48,8 @@ macro(mbgl_platform_core) PRIVATE platform/default/offscreen_view.cpp # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) target_add_mason_package(mbgl-core PUBLIC geojson) diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 288ed68d6..0feaa3d30 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -22,7 +22,7 @@ #import #import #import -#import +#import #import #import #import diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 76c1d691d..cb284afcf 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -31,7 +31,8 @@ set(MBGL_QT_FILES PRIVATE platform/default/log_stderr.cpp # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp # Platform integration PRIVATE platform/qt/src/async_task.cpp diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index e7a14601c..edff728dd 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/platform/qt/src/qmapboxgl_p.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/actor/actor.test.cpp b/test/actor/actor.test.cpp index c24d0b6c2..03f41a6e6 100644 --- a/test/actor/actor.test.cpp +++ b/test/actor/actor.test.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/test/actor/actor_ref.test.cpp b/test/actor/actor_ref.test.cpp index 4be714278..78721c965 100644 --- a/test/actor/actor_ref.test.cpp +++ b/test/actor/actor_ref.test.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp index 458ac3f13..a06567301 100644 --- a/test/api/annotations.test.cpp +++ b/test/api/annotations.test.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include #include diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp index f96bf7861..d28051449 100644 --- a/test/api/api_misuse.test.cpp +++ b/test/api/api_misuse.test.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp index 9287f0218..e58fd0a68 100644 --- a/test/api/custom_layer.test.cpp +++ b/test/api/custom_layer.test.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp index 506464ea1..a25e4df31 100644 --- a/test/api/query.test.cpp +++ b/test/api/query.test.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/api/render_missing.test.cpp b/test/api/render_missing.test.cpp index 8f7821205..b209713d0 100644 --- a/test/api/render_missing.test.cpp +++ b/test/api/render_missing.test.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/api/repeated_render.test.cpp b/test/api/repeated_render.test.cpp index 67670916f..a50fb4c6b 100644 --- a/test/api/repeated_render.test.cpp +++ b/test/api/repeated_render.test.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 682060324..b945b5e89 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp index 8d650ed17..e40089c09 100644 --- a/test/style/source.test.cpp +++ b/test/style/source.test.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp index 2a15fd1b9..0d599ceae 100644 --- a/test/tile/raster_tile.test.cpp +++ b/test/tile/raster_tile.test.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp index c07db42c3..210422fee 100644 --- a/test/tile/vector_tile.test.cpp +++ b/test/tile/vector_tile.test.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp index bd67e2c26..420967bdf 100644 --- a/test/util/memory.test.cpp +++ b/test/util/memory.test.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include