diff options
author | Chris Loer <chris.loer@gmail.com> | 2017-11-13 15:09:42 -0800 |
---|---|---|
committer | Chris Loer <chris.loer@gmail.com> | 2017-11-13 15:09:42 -0800 |
commit | a8a97aebc684a619471cf64c7b0e01f72a56a80a (patch) | |
tree | bf7df488d76b212424c9437c461fc3e462a0d8b7 | |
parent | 20e7039734ce5983d43ab8f4e540483708719db8 (diff) | |
download | qtlocation-mapboxgl-a8a97aebc684a619471cf64c7b0e01f72a56a80a.tar.gz |
Use optional value_or
-rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index bdd5933987..fc1ede56ff 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -320,7 +320,7 @@ void SymbolLayout::addFeature(const std::size_t index, symbolInstances.size(), textBoxScale, textPadding, textPlacement, textOffset, iconBoxScale, iconPadding, iconOffset, - glyphPositionMap, indexedFeature, index, feature.text ? *feature.text : std::u16string{}, overscaling); + glyphPositionMap, indexedFeature, index, feature.text.value_or(std::u16string()), overscaling); } }; |