[core] Use expected.hpp from mapbox-base

mapbox · Nov 8, 2019 · 55e18a6 · 55e18a6
1 parent 2e8a350
commit 55e18a6
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 1,782 deletions.
diff --git a/cmake/core.cmake b/cmake/core.cmake
@@ -10,7 +10,6 @@ target_include_directories(mbgl-core
 target_link_libraries(mbgl-core PRIVATE
     mbgl-vendor-earcut.hpp
     mbgl-vendor-eternal
-    mbgl-vendor-expected
     mbgl-vendor-geojson-vt-cpp
     mbgl-vendor-shelf-pack-cpp
     mbgl-vendor-unique_resource
@@ -32,6 +31,7 @@ target_link_libraries(mbgl-core PUBLIC
     mbgl-vendor-polylabel
     mbgl-vendor-protozero
     Mapbox::Base::Extras::rapidjson
+    Mapbox::Base::Extras::expected-lite
     mbgl-vendor-vector-tile
 )
 

diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake
@@ -10,7 +10,7 @@ target_include_directories(mbgl-filesource
 
 target_link_libraries(mbgl-filesource
     PUBLIC mbgl-core
-    PUBLIC mbgl-vendor-expected
+    PUBLIC Mapbox::Base::Extras::expected-lite
 )
 
 mbgl_filesource()

diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake
@@ -49,7 +49,7 @@ target_link_libraries(
         mbgl-core
         mbgl-filesource
         Mapbox::Base::Extras::args
-        mbgl-vendor-expected
+        Mapbox::Base::Extras::expected-lite
         Mapbox::Base::Extras::filesystem
         Mapbox::Base::pixelmatch-cpp
         Mapbox::Base::Extras::rapidjson

diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
@@ -8,7 +8,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/boost.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/cheap-ruler-cpp.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/earcut.hpp.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/eternal.cmake)
-include(${CMAKE_SOURCE_DIR}/vendor/expected.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/googletest.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake)

diff --git a/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp
@@ -32,12 +32,12 @@ class OfflineTilePyramidRegionDefinition {
     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 @@ class OfflineGeometryRegionDefinition {
     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 @@ class OfflineRegionObserver {
 
 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 @@ class OfflineRegion {
                   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
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <expected.hpp>
+#include <nonstd/expected.hpp>
 
 namespace mbgl {
 

diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK
@@ -41,7 +41,6 @@ mbgl_vendor_library("icu")
 mbgl_vendor_library("boost")
 mbgl_vendor_library("cheap-ruler-cpp")
 mbgl_vendor_library("earcut.hpp")
-mbgl_vendor_library("expected")
 mbgl_vendor_library("eternal")
 mbgl_vendor_library("geojson-vt-cpp")
 mbgl_vendor_library("mapbox-base")

diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt
@@ -890,7 +890,6 @@ endif(NOT TARGET mapbox-base)
 include(${PROJECT_SOURCE_DIR}/vendor/boost.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/earcut.hpp.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/eternal.cmake)
-include(${PROJECT_SOURCE_DIR}/vendor/expected.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/polylabel.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/protozero.cmake)
@@ -915,6 +914,7 @@ target_link_libraries(
         mbgl-vendor-vector-tile
         mbgl-vendor-wagyu
     PUBLIC
+        Mapbox::Base::Extras::expected-lite
         Mapbox::Base::Extras::rapidjson
         Mapbox::Base::geojson.hpp
         Mapbox::Base::geometry.hpp
@@ -923,7 +923,6 @@ target_link_libraries(
         Mapbox::Base::value
         Mapbox::Base::variant
         Mapbox::Base::weak
-        mbgl-vendor-expected
 )
 
 set_property(TARGET mbgl-core PROPERTY FOLDER Core)

diff --git a/platform/default/src/mbgl/storage/offline.cpp b/platform/default/src/mbgl/storage/offline.cpp
@@ -150,7 +150,6 @@ OfflineRegion::OfflineRegion(int64_t id_,
       metadata(std::move(metadata_)) {
 }
 
-OfflineRegion::OfflineRegion(OfflineRegion&&) = default;
 OfflineRegion::~OfflineRegion() = default;
 
 const OfflineRegionDefinition& OfflineRegion::getDefinition() const {

diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js
@@ -130,12 +130,12 @@ generateFileList('vendor/boost-files.json', [ 'vendor/boost' ], vendorRegex, [ "
 generateFileList('vendor/cheap-ruler-cpp-files.json', [ 'vendor/cheap-ruler-cpp' ], vendorRegex, [ "include/**/*.hpp" ]);
 generateFileList('vendor/earcut.hpp-files.json', [ 'vendor/earcut.hpp' ], vendorRegex, [ "include/**/*.hpp" ]);
 generateFileList('vendor/eternal-files.json', [ 'vendor/eternal' ], vendorRegex, [ "include/**/*.hpp" ]);
-generateFileList('vendor/expected-files.json', [ 'vendor/expected' ], vendorRegex, [ "include/expected.hpp" ]);
 generateFileList('vendor/geojson-vt-cpp-files.json', [ 'vendor/geojson-vt-cpp' ], vendorRegex, [ "include/**/*.hpp" ]);
 generateFileList('vendor/icu-files.json', [ 'vendor/icu' ], vendorRegex, [ "include/**/*.h", "src/*.h", "src/*.cpp" ]);
 generateFileList('vendor/mapbox-base-files.json',
     [ 'vendor/mapbox-base/extras/kdbush.hpp',
       'vendor/mapbox-base/extras/filesystem',
+      'vendor/mapbox-base/extras/expected-lite',
       'vendor/mapbox-base/extras/rapidjson',
       'vendor/mapbox-base/mapbox/pixelmatch-cpp',
       'vendor/mapbox-base/mapbox/geometry.hpp',

diff --git a/scripts/standalone.sh b/scripts/standalone.sh
@@ -53,7 +53,6 @@ rsync -rR $(git ls-files \
 
 echo ">> Copying vendored files..."
 rsync -rR $(git ls-files \
-    "vendor/expected" \
     "vendor/icu" \
     "vendor/nunicode" \
     "vendor/sqlite" \

diff --git a/vendor/expected-files.json b/vendor/expected-files.json
diff --git a/vendor/expected.cmake b/vendor/expected.cmake
diff --git a/vendor/expected/LICENSE.txt b/vendor/expected/LICENSE.txt
diff --git a/vendor/expected/files.txt b/vendor/expected/files.txt