summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/tile-image.hpp2
-rw-r--r--test/tile-iter.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/tile-image.hpp b/src/tile-image.hpp
index deaa568b..2ecfd6d7 100644
--- a/src/tile-image.hpp
+++ b/src/tile-image.hpp
@@ -25,7 +25,7 @@ struct tile_image_ref final
tile_image_ref(std::shared_ptr<tile_atlas>& atlas, variant_t& variant) noexcept;
tile_image_ref(const tile_image_ref&) noexcept;
tile_image_ref(tile_image_ref&&) noexcept;
- tile_image_ref& operator=(const tile_image_proto& tile_proto) noexcept;
+ tile_image_ref& operator=(const tile_image_proto& tile_image_proto) noexcept;
operator tile_image_proto() const noexcept;
operator bool() const noexcept;
};
diff --git a/test/tile-iter.cpp b/test/tile-iter.cpp
index a6d49dd2..43ef6bdf 100644
--- a/test/tile-iter.cpp
+++ b/test/tile-iter.cpp
@@ -10,7 +10,6 @@ static inline bool always_false()
bool floormat::test_tile_iter() // NOLINT(readability-function-size)
{
-#if 1
if (always_false())
{
const chunk c;
@@ -21,7 +20,6 @@ bool floormat::test_tile_iter() // NOLINT(readability-function-size)
for (auto [x, k, pt] : c)
static_assert(std::is_same_v<decltype(x), tile_proto>);
}
-#endif
if (always_false())
{
chunk c;