diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-11-07 18:31:40 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-11-08 11:27:30 +0200 |
commit | 55e18a6f81f3b8ee61c3eb70b0d1cbe9a861e44f (patch) | |
tree | b3dc2862462189e266ddedbb01c2ad8101b07fa9 /include | |
parent | 2e8a350d68be75d9505fab9dc897c4abbcae05aa (diff) | |
download | qtlocation-mapboxgl-55e18a6f81f3b8ee61c3eb70b0d1cbe9a861e44f.tar.gz |
[core] Use expected.hpp from mapbox-base
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/storage/offline.hpp | 36 | ||||
-rw-r--r-- | include/mbgl/util/expected.hpp | 2 |
2 files changed, 16 insertions, 22 deletions
diff --git a/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp index baf43dc5f5..f35abbfe38 100644 --- a/include/mbgl/storage/offline.hpp +++ b/include/mbgl/storage/offline.hpp @@ -32,12 +32,12 @@ public: OfflineTilePyramidRegionDefinition(std::string, LatLngBounds, double, double, float, bool); /* Private */ - const std::string styleURL; - const LatLngBounds bounds; - const double minZoom; - const double maxZoom; - const float pixelRatio; - const bool includeIdeographs; + std::string styleURL; + LatLngBounds bounds; + double minZoom; + double maxZoom; + float pixelRatio; + bool includeIdeographs; }; /* @@ -56,12 +56,12 @@ public: OfflineGeometryRegionDefinition(std::string styleURL, Geometry<double>, double minZoom, double maxZoom, float pixelRatio, bool includeIdeographs); /* Private */ - const std::string styleURL; - const Geometry<double> geometry; - const double minZoom; - const double maxZoom; - const float pixelRatio; - const bool includeIdeographs; + std::string styleURL; + Geometry<double> geometry; + double minZoom; + double maxZoom; + float pixelRatio; + bool includeIdeographs; }; /* @@ -211,14 +211,8 @@ public: class OfflineRegion { public: - // Move-only; not publicly constructible. - OfflineRegion(OfflineRegion&&); ~OfflineRegion(); - OfflineRegion() = delete; - OfflineRegion(const OfflineRegion&) = delete; - OfflineRegion& operator=(OfflineRegion&&) = delete; - OfflineRegion& operator=(const OfflineRegion&) = delete; int64_t getID() const; const OfflineRegionDefinition& getDefinition() const; @@ -231,9 +225,9 @@ private: OfflineRegionDefinition, OfflineRegionMetadata); - const int64_t id; - const OfflineRegionDefinition definition; - const OfflineRegionMetadata metadata; + int64_t id; + OfflineRegionDefinition definition; + OfflineRegionMetadata metadata; }; using OfflineRegions = std::vector<OfflineRegion>; diff --git a/include/mbgl/util/expected.hpp b/include/mbgl/util/expected.hpp index 135de3cf9b..53c5b6ab45 100644 --- a/include/mbgl/util/expected.hpp +++ b/include/mbgl/util/expected.hpp @@ -1,6 +1,6 @@ #pragma once -#include <expected.hpp> +#include <nonstd/expected.hpp> namespace mbgl { |