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

[core] Bracket init works for optional<T> in GCC 4.9

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2017-07-19 18:01:32 +03:00
parent 15c5bf359a
commit 5d4ed27068
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/mbgl/renderer/query.hpp
View File

@@ -13,8 +13,8 @@ namespace mbgl {
*/
class RenderedQueryOptions {
public:
RenderedQueryOptions(optional<std::vector<std::string>> layerIDs_ = optional<std::vector<std::string>>(),
optional<style::Filter> filter_ = optional<style::Filter>())
RenderedQueryOptions(optional<std::vector<std::string>> layerIDs_ = {},
optional<style::Filter> filter_ = {})
: layerIDs(std::move(layerIDs_)),
filter(std::move(filter_)) {}
@@ -29,8 +29,8 @@ public:
*/
class SourceQueryOptions {
public:
SourceQueryOptions(optional<std::vector<std::string>> sourceLayers_ = optional<std::vector<std::string>> (),
optional<style::Filter> filter_ = optional<style::Filter>())
SourceQueryOptions(optional<std::vector<std::string>> sourceLayers_ = {},
optional<style::Filter> filter_ = {})
: sourceLayers(std::move(sourceLayers_)),
filter(std::move(filter_)) {}

2
include/mbgl/renderer/renderer.hpp
View File

@@ -26,7 +26,7 @@ class Renderer {
public:
Renderer(RendererBackend&, float pixelRatio_, FileSource&, Scheduler&,
GLContextMode = GLContextMode::Unique,
const optional<std::string> programCacheDir = optional<std::string>());
const optional<std::string> programCacheDir = {});
~Renderer();
void setObserver(RendererObserver*);

4
include/mbgl/style/transition_options.hpp
View File

@@ -11,8 +11,8 @@ public:
optional<Duration> duration;
optional<Duration> delay;
TransitionOptions(optional<Duration> duration_ = optional<Duration>(),
optional<Duration> delay_ = optional<Duration>())
TransitionOptions(optional<Duration> duration_ = {},
optional<Duration> delay_ = {})
: duration(std::move(duration_)),
delay(std::move(delay_)) {}