tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use std::optional instead of mbgl::optional (#911)

Browse Source
This commit is contained in:
Bart Louwers
2023-03-17 12:51:59 +01:00
committed by GitHub
parent 36846439c6
commit 15ad65dd3d
482 changed files with 2605 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/style/source.test.cpp
View File

@@ -34,7 +34,6 @@
#include <mbgl/util/image.hpp>
#include <mbgl/util/logging.hpp>
#include <mbgl/util/optional.hpp>
#include <mbgl/util/range.hpp>
#include <mbgl/util/tileset.hpp>
#include <mbgl/util/timer.hpp>
@@ -47,6 +46,7 @@
#include <mbgl/text/glyph_manager.hpp>
#include <cstdint>
#include <optional>
#include <gmock/gmock.h>
using namespace mbgl;
@@ -466,7 +466,7 @@ TEST(Source, RasterTileCancel) {
test.fileSource->tileResponse = [&] (const Resource&) {
test.end();
return optional<Response>();
return std::optional<Response>();
};
RasterLayer layer("id", "source");
@@ -499,7 +499,7 @@ TEST(Source, RasterDEMTileCancel) {
test.fileSource->tileResponse = [&] (const Resource&) {
test.end();
return optional<Response>();
return std::optional<Response>();
};
HillshadeLayer layer("id", "source");
@@ -532,7 +532,7 @@ TEST(Source, VectorTileCancel) {
test.fileSource->tileResponse = [&] (const Resource&) {
test.end();
return optional<Response>();
return std::optional<Response>();
};
LineLayer layer("id", "source");
@@ -780,7 +780,7 @@ public:
[&](const OverscaledTileID& tileID) { return std::make_unique<FakeTile>(*this, tileID); });
}
const optional<Tileset>& getTileset() const override {
const std::optional<Tileset>& getTileset() const override {
return static_cast<const style::VectorSource::Impl&>(*baseImpl).tileset;
}
};
@@ -877,7 +877,7 @@ TEST(Source, RenderTileSetSourceUpdate) {
mockedUpdateInternal();
}
const optional<Tileset>& getTileset() const override {
const std::optional<Tileset>& getTileset() const override {
return static_cast<const style::VectorSource::Impl&>(*baseImpl).tileset;
}
};
@@ -957,7 +957,7 @@ TEST(Source, SetMaxParentOverscaleFactor) {
tileset.tiles = {"tiles"};
RasterSource source("source", tileset, 512);
ASSERT_EQ(nullopt, source.getMaxOverscaleFactorForParentTiles());
ASSERT_EQ(std::nullopt, source.getMaxOverscaleFactorForParentTiles());
source.setMaxOverscaleFactorForParentTiles(3);
ASSERT_EQ(3, *source.getMaxOverscaleFactorForParentTiles());
source.loadDescription(*test.fileSource);