Make quadkey_t constructor explicit

Author: joto

src/tile.cpp

@@ -55,8 +55,8 @@ static uint32_t deinterleave_lowuint32(uint64_t word) noexcept
 
 quadkey_t tile_t::quadkey() const noexcept
 {
-    return {interleave_uint32_with_zeros(m_x) |
-            (interleave_uint32_with_zeros(m_y) << 1U)};
+    return quadkey_t{interleave_uint32_with_zeros(m_x) |
+                     (interleave_uint32_with_zeros(m_y) << 1U)};
 }
 
 tile_t tile_t::from_quadkey(quadkey_t quadkey, uint32_t zoom) noexcept

src/tile.hpp

@@ -20,7 +20,7 @@ class quadkey_t
 public:
     quadkey_t() noexcept = default;
 
-    quadkey_t(uint64_t value) noexcept : m_value(value) {}
+    explicit quadkey_t(uint64_t value) noexcept : m_value(value) {}
 
     uint64_t value() const noexcept { return m_value; }
 

tests/test-expire-tiles.cpp

@@ -47,7 +47,7 @@ static void expire_centroids(expire_tiles *et, std::set<tile_t> const &tiles)
     }
 }
 
-static void check_quadkey(uint64_t quadkey_expected,
+static void check_quadkey(quadkey_t quadkey_expected,
                           tile_t const &tile) noexcept
 {
     CHECK(tile.quadkey() == quadkey_expected);
@@ -78,10 +78,10 @@ static std::set<tile_t> get_tiles_unordered(expire_tiles *et, uint32_t zoom)
 
 TEST_CASE("tile to quadkey", "[NoDB]")
 {
-    check_quadkey(0x27, tile_t{3, 3, 5});
-    check_quadkey(0xffffffff, tile_t{16, 65535, 65535});
-    check_quadkey(0xfffffffff, tile_t{18, 262143, 262143});
-    check_quadkey(0x3fffffff0, tile_t{18, 131068, 131068});
+    check_quadkey(quadkey_t{0x27}, tile_t{3, 3, 5});
+    check_quadkey(quadkey_t{0xffffffff}, tile_t{16, 65535, 65535});
+    check_quadkey(quadkey_t{0xfffffffff}, tile_t{18, 262143, 262143});
+    check_quadkey(quadkey_t{0x3fffffff0}, tile_t{18, 131068, 131068});
 }
 
 TEST_CASE("simple expire z1", "[NoDB]")

tests/test-tile.cpp

@@ -72,7 +72,7 @@ TEST_CASE("tile_t coordinates zoom=0", "[NoDB]")
     REQUIRE(p.x() == Approx(pp.x()));
     REQUIRE(p.y() == Approx(pp.y()));
 
-    REQUIRE(tile.quadkey() == 0);
+    REQUIRE(tile.quadkey() == quadkey_t{0});
 }
 
 TEST_CASE("tile_t coordinates zoom=2", "[NoDB]")