From 9901167936fa8fe13fa0f93a0604e86fc15b71cd Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 12 Dec 2019 14:49:11 +0200 Subject: [core] Add style::Layer(Impl) constructor --- include/mbgl/style/light.hpp | 1 + include/mbgl/style/light.hpp.ejs | 1 + src/mbgl/style/light.cpp | 7 +++---- src/mbgl/style/light.cpp.ejs | 7 +++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/mbgl/style/light.hpp b/include/mbgl/style/light.hpp index 7434fb2882..dc54f98075 100644 --- a/include/mbgl/style/light.hpp +++ b/include/mbgl/style/light.hpp @@ -51,6 +51,7 @@ public: class Impl; Immutable impl; + explicit Light(Immutable); Mutable mutableImpl() const; LightObserver* observer = nullptr; diff --git a/include/mbgl/style/light.hpp.ejs b/include/mbgl/style/light.hpp.ejs index e4661dc59b..071647965d 100644 --- a/include/mbgl/style/light.hpp.ejs +++ b/include/mbgl/style/light.hpp.ejs @@ -38,6 +38,7 @@ public: <% } -%> class Impl; Immutable impl; + explicit Light(Immutable); Mutable mutableImpl() const; LightObserver* observer = nullptr; diff --git a/src/mbgl/style/light.cpp b/src/mbgl/style/light.cpp index a10e693073..2ef4c2f940 100644 --- a/src/mbgl/style/light.cpp +++ b/src/mbgl/style/light.cpp @@ -17,10 +17,9 @@ namespace style { static LightObserver nullObserver; -Light::Light() - : impl(makeMutable()), - observer(&nullObserver) { -} +Light::Light(Immutable impl_) : impl(std::move(impl_)), observer(&nullObserver) {} + +Light::Light() : Light(makeMutable()) {} Light::~Light() = default; diff --git a/src/mbgl/style/light.cpp.ejs b/src/mbgl/style/light.cpp.ejs index 68c1bf59e2..9f84238839 100644 --- a/src/mbgl/style/light.cpp.ejs +++ b/src/mbgl/style/light.cpp.ejs @@ -20,10 +20,9 @@ namespace style { static LightObserver nullObserver; -Light::Light() - : impl(makeMutable()), - observer(&nullObserver) { -} +Light::Light(Immutable impl_) : impl(std::move(impl_)), observer(&nullObserver) {} + +Light::Light() : Light(makeMutable()) {} Light::~Light() = default; -- cgit v1.2.1