From ed99a7781a6bedcdd682d1f9122c952a244e4c69 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 27 Mar 2020 18:30:35 +0200 Subject: [core] Fix google-build-namespaces errors in header files As reported by clang-tidy-8. --- src/mbgl/algorithm/update_tile_masks.hpp | 4 ---- src/mbgl/gfx/attribute.hpp | 4 ---- src/mbgl/tile/tile_loader_impl.hpp | 6 ++---- 3 files changed, 2 insertions(+), 12 deletions(-) (limited to 'src') 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 bool tileNeedsMask(const std::reference_wrapper& tile) { return tile.get().usedByRenderedLayers; } template @@ -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 struct AttributeDataTypeOf; template <> struct AttributeDataTypeOf : std::integral_constant {}; template <> struct AttributeDataTypeOf : std::integral_constant {}; @@ -56,8 +54,6 @@ template <> struct AttributeDataTypeOf : std::integral_constant struct AttributeDataTypeOf : std::integral_constant {}; template <> struct AttributeDataTypeOf : std::integral_constant {}; -} // namespace - template 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 -namespace { +namespace mbgl { + inline std::exception_ptr getCantLoadTileError() { return std::make_exception_ptr(std::runtime_error("Can't load tile.")); } -} // namespace - -namespace mbgl { template TileLoader::TileLoader(T& tile_, -- cgit v1.2.1