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 13:52:00 +0200 |
| commit | f32501e9b786a8f832070b060ea3fa0071b8956c (patch) | |
| tree | ea4ac754f100303760c0120e25474eaba0ab7b66 /platform/android/src/style/layers/layer_manager.hpp | |
| parent | d036acefda5cf8beebbb61e490b450e183cca103 (diff) | |
| download | qtlocation-mapboxgl-upstream/mikhail_refactor_layers_android.tar.gz | |
noexcept specifier for layer factory methodsupstream/mikhail_refactor_layers_android
Diffstat (limited to 'platform/android/src/style/layers/layer_manager.hpp')
| -rw-r--r-- | platform/android/src/style/layers/layer_manager.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; }; |