diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-03-05 01:57:25 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-08 18:36:03 +0200 |
| commit | 5954eea345677682479ad5df4d6b059737efd7f0 (patch) | |
| tree | fb363affc86cab1acc5ccd6ec69c8fb44896b5c9 | |
| parent | ce52a9f65a1fa3cb8aaeb9f5035323ec95b6f0a6 (diff) | |
| download | qtlocation-mapboxgl-5954eea345677682479ad5df4d6b059737efd7f0.tar.gz | |
[core] Move ThreadPool to core
It is the same used by all the platforms.
| -rw-r--r-- | platform/android/core-files.json | 1 | ||||
| -rw-r--r-- | platform/ios/core-files.json | 1 | ||||
| -rw-r--r-- | platform/linux/config.cmake | 3 | ||||
| -rw-r--r-- | platform/macos/core-files.json | 1 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 3 | ||||
| -rw-r--r-- | src/core-files.json | 1 | ||||
| -rw-r--r-- | src/mbgl/util/thread_pool.cpp (renamed from platform/default/src/mbgl/platform/thread_pool.cpp) | 0 |
7 files changed, 1 insertions, 9 deletions
diff --git a/platform/android/core-files.json b/platform/android/core-files.json index 78764e99bc..ba56695bdd 100644 --- a/platform/android/core-files.json +++ b/platform/android/core-files.json @@ -88,7 +88,6 @@ "platform/default/src/mbgl/gl/headless_backend.cpp", "platform/default/src/mbgl/gl/headless_frontend.cpp", "platform/default/src/mbgl/map/map_snapshotter.cpp", - "platform/default/src/mbgl/platform/thread_pool.cpp", "platform/default/src/mbgl/text/bidi.cpp", "platform/default/src/mbgl/util/png_writer.cpp", "platform/default/src/mbgl/util/thread_local.cpp", diff --git a/platform/ios/core-files.json b/platform/ios/core-files.json index 26a7857dd2..98833b0c94 100644 --- a/platform/ios/core-files.json +++ b/platform/ios/core-files.json @@ -13,7 +13,6 @@ "platform/default/src/mbgl/gl/headless_backend.cpp", "platform/default/src/mbgl/gl/headless_frontend.cpp", "platform/default/src/mbgl/map/map_snapshotter.cpp", - "platform/default/src/mbgl/platform/thread_pool.cpp", "platform/default/src/mbgl/text/bidi.cpp", "platform/default/src/mbgl/util/png_writer.cpp", "platform/default/src/mbgl/util/thread_local.cpp", diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index ef987533d8..7f8b382571 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -72,9 +72,6 @@ macro(mbgl_platform_core) # Snapshotting PRIVATE platform/default/src/mbgl/map/map_snapshotter.cpp PRIVATE platform/default/include/mbgl/map/map_snapshotter.hpp - - # Thread pool - PRIVATE platform/default/src/mbgl/platform/thread_pool.cpp ) target_include_directories(mbgl-core diff --git a/platform/macos/core-files.json b/platform/macos/core-files.json index eb9357bedb..abeda5796b 100644 --- a/platform/macos/core-files.json +++ b/platform/macos/core-files.json @@ -12,7 +12,6 @@ "platform/default/src/mbgl/gl/headless_backend.cpp", "platform/default/src/mbgl/gl/headless_frontend.cpp", "platform/default/src/mbgl/map/map_snapshotter.cpp", - "platform/default/src/mbgl/platform/thread_pool.cpp", "platform/default/src/mbgl/text/bidi.cpp", "platform/default/src/mbgl/util/png_writer.cpp", "platform/default/src/mbgl/util/thread_local.cpp", diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 2751ad1fad..1d0bb3d29c 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -17,9 +17,6 @@ set(MBGL_QT_CORE_FILES PRIVATE platform/default/include/mbgl/gl/headless_backend.hpp PRIVATE platform/qt/src/headless_backend_qt.cpp - # Thread pool - PRIVATE platform/default/src/mbgl/platform/thread_pool.cpp - # Thread PRIVATE platform/qt/src/thread_local.cpp diff --git a/src/core-files.json b/src/core-files.json index 4521457bb1..dbca83c029 100644 --- a/src/core-files.json +++ b/src/core-files.json @@ -297,6 +297,7 @@ "src/mbgl/util/rapidjson.cpp", "src/mbgl/util/stopwatch.cpp", "src/mbgl/util/string.cpp", + "src/mbgl/util/thread_pool.cpp", "src/mbgl/util/tile_cover.cpp", "src/mbgl/util/tile_cover_impl.cpp", "src/mbgl/util/tiny_sdf.cpp", diff --git a/platform/default/src/mbgl/platform/thread_pool.cpp b/src/mbgl/util/thread_pool.cpp index d213aab71c..d213aab71c 100644 --- a/platform/default/src/mbgl/platform/thread_pool.cpp +++ b/src/mbgl/util/thread_pool.cpp |