noexcept specifier for layer factory methods

3 files changed, 11 insertions, 8 deletions

diff --git a/platform/android/src/style/layers/layer_manager.cpp b/platform/android/src/style/layers/layer_manager.cpp
index ed553bc8e6..72bc317607 100644
--- a/platform/android/src/style/layers/layer_manager.cpp
+++ b/platform/android/src/style/layers/layer_manager.cpp
@@ -81,7 +81,7 @@ JavaLayerPeerFactory* LayerManagerAndroid::getPeerFactory(mbgl::style::Layer* la
     return nullptr;
 }
 
-std::unique_ptr<style::Layer> LayerManagerAndroid::createLayer(const std::string& type, const std::string& id, const style::conversion::Convertible& value, style::conversion::Error& error) {
+std::unique_ptr<style::Layer> LayerManagerAndroid::createLayer(const std::string& type, const std::string& id, const style::conversion::Convertible& value, style::conversion::Error& error) noexcept{
     for (const auto& factory: factories) {
         auto* layerFactory = factory->getLayerFactory();
         if (layerFactory->supportsType(type)) {
@@ -97,7 +97,7 @@ std::unique_ptr<style::Layer> LayerManagerAndroid::createLayer(const std::string
 }
 
 // static 
-LayerManagerAndroid* LayerManagerAndroid::get() {
+LayerManagerAndroid* LayerManagerAndroid::get() noexcept {
     static LayerManagerAndroid impl;
     return &impl;
 }
@@ -106,7 +106,7 @@ LayerManagerAndroid* LayerManagerAndroid::get() {
 
 namespace style {
 // static 
-LayerManager* LayerManager::get() {
+LayerManager* LayerManager::get() noexcept {
     return android::LayerManagerAndroid::get();
 }
 
diff --git a/platform/android/src/style/layers/layer_manager.hpp b/platform/android/src/style/layers/layer_manager.hpp
index 7684108555..cec9d39d8c 100644
--- a/platform/android/src/style/layers/layer_manager.hpp
+++ b/platform/android/src/style/layers/layer_manager.hpp
@@ -19,7 +19,7 @@ namespace android {
 class LayerManagerAndroid : public mbgl::style::LayerManager {
 public:
     ~LayerManagerAndroid() override;
-    static LayerManagerAndroid* get();
+    static LayerManagerAndroid* get() noexcept;
     
     jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::Map&, mbgl::style::Layer&);
     jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, std::unique_ptr<mbgl::style::Layer>);
@@ -30,7 +30,7 @@ private:
     LayerManagerAndroid();
     JavaLayerPeerFactory* getPeerFactory(mbgl::style::Layer*);
     // mbgl:style::LayerManager overrides.
-    std::unique_ptr<style::Layer> createLayer(const std::string& type, const std::string& id, const style::conversion::Convertible& value, style::conversion::Error& error) final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& type, const std::string& id, const style::conversion::Convertible& value, style::conversion::Error& error) noexcept final;
 
     std::vector<std::unique_ptr<JavaLayerPeerFactory>> factories;
 };
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;
 }