diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-03-23 13:18:45 +0200 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-03-23 11:33:06 -0400 |
| commit | 71efb24e2d3e2408f6e283ed7b8b4a1f6b24324c (patch) | |
| tree | 9e967525c261baf0172d6bffc7d88572691c83f5 /include | |
| parent | 648ce071d39e275ddfcd20a94a6f96547c314635 (diff) | |
| download | qtlocation-mapboxgl-71efb24e2d3e2408f6e283ed7b8b4a1f6b24324c.tar.gz | |
Bump mapbox-base to 1.2.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/actor/mailbox.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/actor/scheduler.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/platform/settings.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/storage/file_source.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/style/conversion_impl.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/style/layer.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/style/source.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/style/transition_options.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/util/feature.hpp | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/include/mbgl/actor/mailbox.hpp b/include/mbgl/actor/mailbox.hpp index 86ea0100fc..39b33275a6 100644 --- a/include/mbgl/actor/mailbox.hpp +++ b/include/mbgl/actor/mailbox.hpp @@ -7,7 +7,7 @@ #include <mutex> #include <queue> -#include <mapbox/weak.hpp> +#include <mapbox/std/weak.hpp> namespace mbgl { diff --git a/include/mbgl/actor/scheduler.hpp b/include/mbgl/actor/scheduler.hpp index dca6b132f4..cdaf185c8b 100644 --- a/include/mbgl/actor/scheduler.hpp +++ b/include/mbgl/actor/scheduler.hpp @@ -2,7 +2,7 @@ #include <mbgl/util/pass_types.hpp> -#include <mapbox/weak.hpp> +#include <mapbox/std/weak.hpp> #include <functional> #include <memory> diff --git a/include/mbgl/platform/settings.hpp b/include/mbgl/platform/settings.hpp index 722d0d2b3b..af5dcce212 100644 --- a/include/mbgl/platform/settings.hpp +++ b/include/mbgl/platform/settings.hpp @@ -1,6 +1,6 @@ #pragma once -#include <mapbox/value.hpp> +#include <mapbox/compatibility/value.hpp> #include <memory> diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp index 43143c640f..3306d8d76a 100644 --- a/include/mbgl/storage/file_source.hpp +++ b/include/mbgl/storage/file_source.hpp @@ -3,7 +3,7 @@ #include <mbgl/storage/resource_transform.hpp> #include <mbgl/storage/response.hpp> -#include <mapbox/value.hpp> +#include <mapbox/compatibility/value.hpp> #include <functional> #include <memory> diff --git a/include/mbgl/style/conversion_impl.hpp b/include/mbgl/style/conversion_impl.hpp index 9606c7b58d..79e9301842 100644 --- a/include/mbgl/style/conversion_impl.hpp +++ b/include/mbgl/style/conversion_impl.hpp @@ -11,7 +11,7 @@ #include <mbgl/util/optional.hpp> #include <mbgl/util/traits.hpp> -#include <mapbox/value.hpp> +#include <mapbox/compatibility/value.hpp> #include <array> #include <chrono> diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index 840ef9ce88..204cb9c697 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -6,8 +6,8 @@ #include <mbgl/util/immutable.hpp> #include <mbgl/util/optional.hpp> -#include <mapbox/weak.hpp> -#include <mapbox/type_wrapper.hpp> +#include <mapbox/std/weak.hpp> +#include <mapbox/util/type_wrapper.hpp> #include <cassert> #include <memory> diff --git a/include/mbgl/style/source.hpp b/include/mbgl/style/source.hpp index 59afd6916e..622c2e42ff 100644 --- a/include/mbgl/style/source.hpp +++ b/include/mbgl/style/source.hpp @@ -5,8 +5,8 @@ #include <mbgl/util/immutable.hpp> #include <mbgl/style/types.hpp> -#include <mapbox/weak.hpp> -#include <mapbox/type_wrapper.hpp> +#include <mapbox/std/weak.hpp> +#include <mapbox/util/type_wrapper.hpp> #include <memory> #include <string> diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp index 69479afaad..8ead79eb21 100644 --- a/include/mbgl/style/transition_options.hpp +++ b/include/mbgl/style/transition_options.hpp @@ -3,7 +3,7 @@ #include <mbgl/util/chrono.hpp> #include <mbgl/util/optional.hpp> -#include <mapbox/value.hpp> +#include <mapbox/compatibility/value.hpp> namespace mbgl { namespace style { diff --git a/include/mbgl/util/feature.hpp b/include/mbgl/util/feature.hpp index 5d8fe89e36..92d7ebf9da 100644 --- a/include/mbgl/util/feature.hpp +++ b/include/mbgl/util/feature.hpp @@ -3,7 +3,7 @@ #include <mbgl/util/optional.hpp> #include <mbgl/util/string.hpp> -#include <mapbox/value.hpp> +#include <mapbox/compatibility/value.hpp> namespace mbgl { |