diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-27 18:30:35 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-04-17 13:36:50 +0300 |
| commit | ed99a7781a6bedcdd682d1f9122c952a244e4c69 (patch) | |
| tree | 373cbd0ee71b17212c82f1f2e97650e4413e58c1 | |
| parent | 63ef5298cd70ce720a6c1289435b5043517b6f30 (diff) | |
| download | qtlocation-mapboxgl-ed99a7781a6bedcdd682d1f9122c952a244e4c69.tar.gz | |
[core] Fix google-build-namespaces errors in header files
As reported by clang-tidy-8.
| -rw-r--r-- | src/mbgl/algorithm/update_tile_masks.hpp | 4 | ||||
| -rw-r--r-- | src/mbgl/gfx/attribute.hpp | 4 | ||||
| -rw-r--r-- | src/mbgl/tile/tile_loader_impl.hpp | 6 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/mbgl/algorithm/update_tile_masks.hpp b/src/mbgl/algorithm/update_tile_masks.hpp index 80e0a39be1..000be1606c 100644 --- a/src/mbgl/algorithm/update_tile_masks.hpp +++ b/src/mbgl/algorithm/update_tile_masks.hpp @@ -9,8 +9,6 @@ namespace mbgl { namespace algorithm { -namespace { - template <typename T> bool tileNeedsMask(const std::reference_wrapper<T>& tile) { return tile.get().usedByRenderedLayers; } template <typename T> @@ -55,8 +53,6 @@ void computeTileMasks( mask.emplace(diffZ, ref.canonical.x - (root.x << diffZ), ref.canonical.y - (root.y << diffZ)); } -} // namespace - // Updates the TileMasks for all renderable tiles. Each renderable tile has a corresponding UnwrappedTileID // indicating where it should be rendered on the screen. A TileMask describes all regions // within a renderable tile that are *not* covered by other renderable tiles. diff --git a/src/mbgl/gfx/attribute.hpp b/src/mbgl/gfx/attribute.hpp index ecb2b5e1b2..907087d8bb 100644 --- a/src/mbgl/gfx/attribute.hpp +++ b/src/mbgl/gfx/attribute.hpp @@ -24,8 +24,6 @@ namespace mbgl { namespace gfx { -namespace { - template <typename, std::size_t> struct AttributeDataTypeOf; template <> struct AttributeDataTypeOf<int8_t, 1> : std::integral_constant<AttributeDataType, AttributeDataType::Byte> {}; template <> struct AttributeDataTypeOf<int8_t, 2> : std::integral_constant<AttributeDataType, AttributeDataType::Byte2> {}; @@ -56,8 +54,6 @@ template <> struct AttributeDataTypeOf<float, 2> : std::integral_constant<Attrib template <> struct AttributeDataTypeOf<float, 3> : std::integral_constant<AttributeDataType, AttributeDataType::Float3> {}; template <> struct AttributeDataTypeOf<float, 4> : std::integral_constant<AttributeDataType, AttributeDataType::Float4> {}; -} // namespace - template <typename T, std::size_t N> class AttributeType { public: diff --git a/src/mbgl/tile/tile_loader_impl.hpp b/src/mbgl/tile/tile_loader_impl.hpp index b12b5c73fb..b518ac6782 100644 --- a/src/mbgl/tile/tile_loader_impl.hpp +++ b/src/mbgl/tile/tile_loader_impl.hpp @@ -8,13 +8,11 @@ #include <cassert> -namespace { +namespace mbgl { + inline std::exception_ptr getCantLoadTileError() { return std::make_exception_ptr(std::runtime_error("Can't load tile.")); } -} // namespace - -namespace mbgl { template <typename T> TileLoader<T>::TileLoader(T& tile_, |