[core] Make mblg::Programs methods noexcept

mapbox · Dec 18, 2018 · 25ea831 · 25ea831
1 parent 025c24c
commit 25ea831
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/mbgl/programs/programs.cpp b/src/mbgl/programs/programs.cpp
@@ -11,11 +11,11 @@
 #include <mbgl/programs/symbol_program.hpp>
 
 #define MBGL_DEFINE_GET_LAYER_PROGRAMS(ProgramsType, property)                 \
-ProgramsType& Programs::get##ProgramsType() {                                  \
+ProgramsType& Programs::get##ProgramsType() noexcept {                         \
     if (!property) {                                                           \
         property = std::make_unique<ProgramsType>(context, programParameters); \
     }                                                                          \
-    return static_cast<ProgramsType&>(*property);                                                          \
+    return static_cast<ProgramsType&>(*property);                              \
 }
 
 namespace mbgl {

diff --git a/src/mbgl/programs/programs.hpp b/src/mbgl/programs/programs.hpp
@@ -23,15 +23,15 @@ class Programs {
     Programs(gl::Context&, const ProgramParameters&);
     ~Programs();
 
-    BackgroundLayerPrograms& getBackgroundLayerPrograms();
-    RasterLayerPrograms& getRasterLayerPrograms();
-    HeatmapLayerPrograms& getHeatmapLayerPrograms();
-    CircleLayerPrograms& getCircleLayerPrograms();
-    HillshadeLayerPrograms& getHillshadeLayerPrograms();
-    FillLayerPrograms& getFillLayerPrograms();
-    FillExtrusionLayerPrograms& getFillExtrusionLayerPrograms();
-    LineLayerPrograms& getLineLayerPrograms();
-    SymbolLayerPrograms& getSymbolLayerPrograms();
+    BackgroundLayerPrograms& getBackgroundLayerPrograms() noexcept;
+    RasterLayerPrograms& getRasterLayerPrograms() noexcept;
+    HeatmapLayerPrograms& getHeatmapLayerPrograms() noexcept;
+    CircleLayerPrograms& getCircleLayerPrograms() noexcept;
+    HillshadeLayerPrograms& getHillshadeLayerPrograms() noexcept;
+    FillLayerPrograms& getFillLayerPrograms() noexcept;
+    FillExtrusionLayerPrograms& getFillExtrusionLayerPrograms() noexcept;
+    LineLayerPrograms& getLineLayerPrograms() noexcept;
+    SymbolLayerPrograms& getSymbolLayerPrograms() noexcept;
 
     DebugProgram debug;
     ClippingMaskProgram clippingMask;