From 5d4ed2706813cb9822d40763b76e867a577cbfdc Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 19 Jul 2017 18:01:32 +0300 Subject: [core] Bracket init works for optional in GCC 4.9 --- include/mbgl/renderer/query.hpp | 8 ++++---- include/mbgl/renderer/renderer.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include/mbgl/renderer') diff --git a/include/mbgl/renderer/query.hpp b/include/mbgl/renderer/query.hpp index b9d5f21a44..4cadf4f017 100644 --- a/include/mbgl/renderer/query.hpp +++ b/include/mbgl/renderer/query.hpp @@ -13,8 +13,8 @@ namespace mbgl { */ class RenderedQueryOptions { public: - RenderedQueryOptions(optional> layerIDs_ = optional>(), - optional filter_ = optional()) + RenderedQueryOptions(optional> layerIDs_ = {}, + optional filter_ = {}) : layerIDs(std::move(layerIDs_)), filter(std::move(filter_)) {} @@ -29,8 +29,8 @@ public: */ class SourceQueryOptions { public: - SourceQueryOptions(optional> sourceLayers_ = optional> (), - optional filter_ = optional()) + SourceQueryOptions(optional> sourceLayers_ = {}, + optional filter_ = {}) : sourceLayers(std::move(sourceLayers_)), filter(std::move(filter_)) {} diff --git a/include/mbgl/renderer/renderer.hpp b/include/mbgl/renderer/renderer.hpp index c209e03045..083102acbe 100644 --- a/include/mbgl/renderer/renderer.hpp +++ b/include/mbgl/renderer/renderer.hpp @@ -26,7 +26,7 @@ class Renderer { public: Renderer(RendererBackend&, float pixelRatio_, FileSource&, Scheduler&, GLContextMode = GLContextMode::Unique, - const optional programCacheDir = optional()); + const optional programCacheDir = {}); ~Renderer(); void setObserver(RendererObserver*); -- cgit v1.2.1