diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-02 13:32:05 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-02 13:32:05 +0300 |
commit | 18c3f70051e04916a089651b75d0ead366e36dae (patch) | |
tree | a6559abc58e617e69e360282acf767ec0e4e5eb2 | |
parent | bb5d638dfaf0bab8e89fd285ab5740d55b32a11f (diff) | |
download | qtlocation-mapboxgl-upstream/mikhail_fix_layer_paint_properties_update.tar.gz |
[core] Make LayerProperties::constantsMask() noexceptupstream/mikhail_fix_layer_paint_properties_update
so that it does not bloat binary size
21 files changed, 21 insertions, 21 deletions
diff --git a/include/mbgl/style/layer_properties.hpp b/include/mbgl/style/layer_properties.hpp index c238faf02f..cfcef1ae00 100644 --- a/include/mbgl/style/layer_properties.hpp +++ b/include/mbgl/style/layer_properties.hpp @@ -14,7 +14,7 @@ class LayerProperties { public: virtual ~LayerProperties() = default; // Returns constants mask for the data-driven properties. - virtual unsigned long constantsMask() const { return 0u; } + virtual unsigned long constantsMask() const noexcept { return 0u; } Immutable<Layer::Impl> baseImpl; protected: diff --git a/src/mbgl/style/layers/background_layer_properties.cpp b/src/mbgl/style/layers/background_layer_properties.cpp index 63f6a7be68..e259b8609b 100644 --- a/src/mbgl/style/layers/background_layer_properties.cpp +++ b/src/mbgl/style/layers/background_layer_properties.cpp @@ -21,7 +21,7 @@ BackgroundLayerProperties::BackgroundLayerProperties( BackgroundLayerProperties::~BackgroundLayerProperties() = default; -unsigned long BackgroundLayerProperties::constantsMask() const { +unsigned long BackgroundLayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/background_layer_properties.hpp b/src/mbgl/style/layers/background_layer_properties.hpp index 56db696533..18b4eef338 100644 --- a/src/mbgl/style/layers/background_layer_properties.hpp +++ b/src/mbgl/style/layers/background_layer_properties.hpp @@ -41,7 +41,7 @@ public: BackgroundPaintProperties::PossiblyEvaluated); ~BackgroundLayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const BackgroundLayer::Impl& layerImpl() const; // Data members. diff --git a/src/mbgl/style/layers/circle_layer_properties.cpp b/src/mbgl/style/layers/circle_layer_properties.cpp index 03a4a8f56e..e0ef270444 100644 --- a/src/mbgl/style/layers/circle_layer_properties.cpp +++ b/src/mbgl/style/layers/circle_layer_properties.cpp @@ -19,7 +19,7 @@ CircleLayerProperties::CircleLayerProperties( CircleLayerProperties::~CircleLayerProperties() = default; -unsigned long CircleLayerProperties::constantsMask() const { +unsigned long CircleLayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/circle_layer_properties.hpp b/src/mbgl/style/layers/circle_layer_properties.hpp index 1aaa3bb3e3..49b53f96ee 100644 --- a/src/mbgl/style/layers/circle_layer_properties.hpp +++ b/src/mbgl/style/layers/circle_layer_properties.hpp @@ -80,7 +80,7 @@ public: CirclePaintProperties::PossiblyEvaluated); ~CircleLayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const CircleLayer::Impl& layerImpl() const; // Data members. diff --git a/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp b/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp index ddfe9c8468..e4e711237f 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp +++ b/src/mbgl/style/layers/fill_extrusion_layer_properties.cpp @@ -21,7 +21,7 @@ FillExtrusionLayerProperties::FillExtrusionLayerProperties( FillExtrusionLayerProperties::~FillExtrusionLayerProperties() = default; -unsigned long FillExtrusionLayerProperties::constantsMask() const { +unsigned long FillExtrusionLayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp index 69b8a0bcb8..1b8757ef29 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp +++ b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp @@ -66,7 +66,7 @@ public: FillExtrusionPaintProperties::PossiblyEvaluated); ~FillExtrusionLayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const FillExtrusionLayer::Impl& layerImpl() const; // Data members. diff --git a/src/mbgl/style/layers/fill_layer_properties.cpp b/src/mbgl/style/layers/fill_layer_properties.cpp index de917177f6..87106fa903 100644 --- a/src/mbgl/style/layers/fill_layer_properties.cpp +++ b/src/mbgl/style/layers/fill_layer_properties.cpp @@ -21,7 +21,7 @@ FillLayerProperties::FillLayerProperties( FillLayerProperties::~FillLayerProperties() = default; -unsigned long FillLayerProperties::constantsMask() const { +unsigned long FillLayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/fill_layer_properties.hpp b/src/mbgl/style/layers/fill_layer_properties.hpp index 4e1b6970fe..ef3a2385d7 100644 --- a/src/mbgl/style/layers/fill_layer_properties.hpp +++ b/src/mbgl/style/layers/fill_layer_properties.hpp @@ -61,7 +61,7 @@ public: FillPaintProperties::PossiblyEvaluated); ~FillLayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const FillLayer::Impl& layerImpl() const; // Data members. diff --git a/src/mbgl/style/layers/heatmap_layer_properties.cpp b/src/mbgl/style/layers/heatmap_layer_properties.cpp index cc50073651..0ecbf8ed39 100644 --- a/src/mbgl/style/layers/heatmap_layer_properties.cpp +++ b/src/mbgl/style/layers/heatmap_layer_properties.cpp @@ -19,7 +19,7 @@ HeatmapLayerProperties::HeatmapLayerProperties( HeatmapLayerProperties::~HeatmapLayerProperties() = default; -unsigned long HeatmapLayerProperties::constantsMask() const { +unsigned long HeatmapLayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/heatmap_layer_properties.hpp b/src/mbgl/style/layers/heatmap_layer_properties.hpp index 634cbef1ed..47c32f7a80 100644 --- a/src/mbgl/style/layers/heatmap_layer_properties.hpp +++ b/src/mbgl/style/layers/heatmap_layer_properties.hpp @@ -49,7 +49,7 @@ public: HeatmapPaintProperties::PossiblyEvaluated); ~HeatmapLayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const HeatmapLayer::Impl& layerImpl() const; // Data members. diff --git a/src/mbgl/style/layers/hillshade_layer_properties.cpp b/src/mbgl/style/layers/hillshade_layer_properties.cpp index 72acc235e2..acf45477b1 100644 --- a/src/mbgl/style/layers/hillshade_layer_properties.cpp +++ b/src/mbgl/style/layers/hillshade_layer_properties.cpp @@ -19,7 +19,7 @@ HillshadeLayerProperties::HillshadeLayerProperties( HillshadeLayerProperties::~HillshadeLayerProperties() = default; -unsigned long HillshadeLayerProperties::constantsMask() const { +unsigned long HillshadeLayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/hillshade_layer_properties.hpp b/src/mbgl/style/layers/hillshade_layer_properties.hpp index e38e5bb5b3..c27b84d46f 100644 --- a/src/mbgl/style/layers/hillshade_layer_properties.hpp +++ b/src/mbgl/style/layers/hillshade_layer_properties.hpp @@ -55,7 +55,7 @@ public: HillshadePaintProperties::PossiblyEvaluated); ~HillshadeLayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const HillshadeLayer::Impl& layerImpl() const; // Data members. diff --git a/src/mbgl/style/layers/layer_properties.cpp.ejs b/src/mbgl/style/layers/layer_properties.cpp.ejs index fcdcfda7be..911851d3f2 100644 --- a/src/mbgl/style/layers/layer_properties.cpp.ejs +++ b/src/mbgl/style/layers/layer_properties.cpp.ejs @@ -30,7 +30,7 @@ namespace style { <%- camelize(type) %>LayerProperties::~<%- camelize(type) %>LayerProperties() = default; -unsigned long <%- camelize(type) %>LayerProperties::constantsMask() const { +unsigned long <%- camelize(type) %>LayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/layer_properties.hpp.ejs b/src/mbgl/style/layers/layer_properties.hpp.ejs index 4513146d6d..c755b29123 100644 --- a/src/mbgl/style/layers/layer_properties.hpp.ejs +++ b/src/mbgl/style/layers/layer_properties.hpp.ejs @@ -72,7 +72,7 @@ public: <%- camelize(type) %>PaintProperties::PossiblyEvaluated); ~<%- camelize(type) %>LayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const <%- camelize(type) %>Layer::Impl& layerImpl() const; // Data members. diff --git a/src/mbgl/style/layers/line_layer_properties.cpp b/src/mbgl/style/layers/line_layer_properties.cpp index 46b220661c..4706a65038 100644 --- a/src/mbgl/style/layers/line_layer_properties.cpp +++ b/src/mbgl/style/layers/line_layer_properties.cpp @@ -21,7 +21,7 @@ LineLayerProperties::LineLayerProperties( LineLayerProperties::~LineLayerProperties() = default; -unsigned long LineLayerProperties::constantsMask() const { +unsigned long LineLayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/line_layer_properties.hpp b/src/mbgl/style/layers/line_layer_properties.hpp index dac6cebae0..07c6f52de4 100644 --- a/src/mbgl/style/layers/line_layer_properties.hpp +++ b/src/mbgl/style/layers/line_layer_properties.hpp @@ -113,7 +113,7 @@ public: LinePaintProperties::PossiblyEvaluated); ~LineLayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const LineLayer::Impl& layerImpl() const; // Data members. diff --git a/src/mbgl/style/layers/raster_layer_properties.cpp b/src/mbgl/style/layers/raster_layer_properties.cpp index 77bdb62b8d..fe3845e1aa 100644 --- a/src/mbgl/style/layers/raster_layer_properties.cpp +++ b/src/mbgl/style/layers/raster_layer_properties.cpp @@ -19,7 +19,7 @@ RasterLayerProperties::RasterLayerProperties( RasterLayerProperties::~RasterLayerProperties() = default; -unsigned long RasterLayerProperties::constantsMask() const { +unsigned long RasterLayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/raster_layer_properties.hpp b/src/mbgl/style/layers/raster_layer_properties.hpp index 9ddd6cc790..035a918f8b 100644 --- a/src/mbgl/style/layers/raster_layer_properties.hpp +++ b/src/mbgl/style/layers/raster_layer_properties.hpp @@ -65,7 +65,7 @@ public: RasterPaintProperties::PossiblyEvaluated); ~RasterLayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const RasterLayer::Impl& layerImpl() const; // Data members. diff --git a/src/mbgl/style/layers/symbol_layer_properties.cpp b/src/mbgl/style/layers/symbol_layer_properties.cpp index 5e50535377..8fa9a87308 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.cpp +++ b/src/mbgl/style/layers/symbol_layer_properties.cpp @@ -19,7 +19,7 @@ SymbolLayerProperties::SymbolLayerProperties( SymbolLayerProperties::~SymbolLayerProperties() = default; -unsigned long SymbolLayerProperties::constantsMask() const { +unsigned long SymbolLayerProperties::constantsMask() const noexcept { return evaluated.constantsMask(); } diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index 0c2bcd2661..a8ab5e04be 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -341,7 +341,7 @@ public: SymbolPaintProperties::PossiblyEvaluated); ~SymbolLayerProperties() override; - unsigned long constantsMask() const override; + unsigned long constantsMask() const noexcept override; const SymbolLayer::Impl& layerImpl() const; // Data members. |