diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-06 16:48:18 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-07 16:34:20 +0200 |
commit | 5a70f2b15081bede66a2d736dc3e8f90ba73d601 (patch) | |
tree | ea4ac754f100303760c0120e25474eaba0ab7b66 /platform/default | |
parent | 1ba1ead3eab5eb27c24163b93b04b49ffbdf2a3b (diff) | |
download | qtlocation-mapboxgl-5a70f2b15081bede66a2d736dc3e8f90ba73d601.tar.gz |
noexcept specifier for layer factory methods
Diffstat (limited to 'platform/default')
-rw-r--r-- | platform/default/layer_manager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/platform/default/layer_manager.cpp b/platform/default/layer_manager.cpp index e497c66729..919bc9e64e 100644 --- a/platform/default/layer_manager.cpp +++ b/platform/default/layer_manager.cpp @@ -21,7 +21,7 @@ public: LayerManagerBase(); private: // LayerManager overrides. - std::unique_ptr<Layer> createLayer(const std::string& type, const std::string& id, const conversion::Convertible& value, conversion::Error& error) final; + std::unique_ptr<Layer> createLayer(const std::string& type, const std::string& id, const conversion::Convertible& value, conversion::Error& error) noexcept final; std::vector<std::unique_ptr<LayerFactory>> factories; }; @@ -37,7 +37,10 @@ LayerManagerBase::LayerManagerBase() { factories.emplace_back(std::unique_ptr<LayerFactory>(new HeatmapLayerFactory)); } -std::unique_ptr<Layer> LayerManagerBase::createLayer(const std::string& type, const std::string& id, const conversion::Convertible& value, conversion::Error& error) { +std::unique_ptr<Layer> LayerManagerBase::createLayer(const std::string& type, + const std::string& id, + const conversion::Convertible& value, + conversion::Error& error) noexcept { for (const auto& factory: factories) { if (factory->supportsType(type)) { auto layer = factory->createLayer(id, value); @@ -52,7 +55,7 @@ std::unique_ptr<Layer> LayerManagerBase::createLayer(const std::string& type, co } // static -LayerManager* LayerManager::get() { +LayerManager* LayerManager::get() noexcept { static LayerManagerBase impl; return &impl; } |