diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/map.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/style/transition_options.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/util/convert.hpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 158e9d733d..d82a260362 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -41,7 +41,7 @@ public: GLContextMode contextMode = GLContextMode::Unique, ConstrainMode constrainMode = ConstrainMode::HeightOnly, ViewportMode viewportMode = ViewportMode::Default, - const optional<std::string>& programCacheDir = {}); + optional<std::string> programCacheDir = optional<std::string>()); ~Map(); // Register a callback that will get called (on the render thread) when all resources have diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp index 6dad17aeb4..0ac7c02c6b 100644 --- a/include/mbgl/style/transition_options.hpp +++ b/include/mbgl/style/transition_options.hpp @@ -8,8 +8,8 @@ namespace style { class TransitionOptions { public: - optional<Duration> duration = {}; - optional<Duration> delay = {}; + optional<Duration> duration; + optional<Duration> delay; TransitionOptions(optional<Duration> duration_ = optional<Duration>(), optional<Duration> delay_ = optional<Duration>()) diff --git a/include/mbgl/util/convert.hpp b/include/mbgl/util/convert.hpp index bedb1a4a08..02ec7feef9 100644 --- a/include/mbgl/util/convert.hpp +++ b/include/mbgl/util/convert.hpp @@ -10,7 +10,7 @@ namespace util { template<typename To, typename From, std::size_t Size, typename = std::enable_if_t<std::is_convertible<From, To>::value>> MBGL_CONSTEXPR std::array<To, Size> convert(const std::array<From, Size>&from) { - std::array<To, Size> to {}; + std::array<To, Size> to {{}}; std::copy(std::begin(from), std::end(from), std::begin(to)); return to; } |