From 82a8446e10738cbba3b8ffd56f1aa55c9b0dc2cf Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Thu, 18 Jan 2018 11:56:42 +1100 Subject: [PATCH] build: silence various type conversion warnings --- alloc/raw/stack.cpp | 4 +++- bezier1.cpp | 6 +++--- bezier2.cpp | 4 ++-- bezier3.cpp | 12 ++++++------ encode/base.hpp | 4 ++-- test/iterator.cpp | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/alloc/raw/stack.cpp b/alloc/raw/stack.cpp index 9e345454..85db14f1 100644 --- a/alloc/raw/stack.cpp +++ b/alloc/raw/stack.cpp @@ -96,7 +96,9 @@ stack::deallocate (void *_ptr, size_t bytes, size_t alignment) { (void)bytes; - alignment = util::max (MIN_ALIGNMENT, alignment); + // TODO: use alignment + (void)alignment; + //alignment = util::max (MIN_ALIGNMENT, alignment); auto ptr = reinterpret_cast (_ptr); diff --git a/bezier1.cpp b/bezier1.cpp index 97c280ea..592d00b4 100644 --- a/bezier1.cpp +++ b/bezier1.cpp @@ -26,8 +26,8 @@ namespace util { point2f bezier<1>::eval (float t) const { - CHECK_GE (t, 0); - CHECK_LE (t, 1); + CHECK_GE (t, 0.f); + CHECK_LE (t, 1.f); auto v0 = (1 - t) * m_points[0]; auto v1 = t * m_points[1]; @@ -72,7 +72,7 @@ namespace util { bezier<1>::distance (util::point2f q) const noexcept { const auto ab = m_points[1] - m_points[0]; - const auto t = limit (closest (q), 0, 1); + const auto t = limit (closest (q), 0.f, 1.f); const auto p = m_points[0] + t * ab; return util::distance (q, p); diff --git a/bezier2.cpp b/bezier2.cpp index 9e6619a2..8bfdaf92 100644 --- a/bezier2.cpp +++ b/bezier2.cpp @@ -26,7 +26,7 @@ namespace util { point2f bezier<2>::eval (float t) const { - CHECK_LIMIT (t, 0, 1); + CHECK_LIMIT (t, 0.f, 1.f); const auto &P0 = m_coeffs[0]; const auto &P1 = m_coeffs[1]; @@ -64,7 +64,7 @@ namespace util { util::vector2f bezier<2>::d1 (const float t) const noexcept { - CHECK_LIMIT (t, 0, 1); + CHECK_LIMIT (t, 0.f, 1.f); const auto &P0 = m_coeffs[0]; const auto &P1 = m_coeffs[1]; diff --git a/bezier3.cpp b/bezier3.cpp index d9262b82..3e174f2c 100644 --- a/bezier3.cpp +++ b/bezier3.cpp @@ -27,8 +27,8 @@ namespace util { point2f bezier<3>::eval (float t) const { - CHECK_GE (t, 0); - CHECK_LE (t, 1); + CHECK_GE (t, 0.f); + CHECK_LE (t, 1.f); auto v0 = pow (1 - t, 3u) * m_points[0]; auto v1 = 3 * pow2 (1 - t) * t * m_points[1]; @@ -96,11 +96,11 @@ namespace util { float bezier<3>::distance (util::point2f target) const noexcept { - static constexpr size_t SUBDIV = 32; + static constexpr int SUBDIV = 32; std::array lookup; - for (size_t i = 0; i < SUBDIV; ++i) - lookup[i] = eval (i / float (SUBDIV - 1)); + for (int i = 0; i < SUBDIV; ++i) + lookup[i] = eval (i / (SUBDIV - 1.f)); size_t best = 0; for (size_t i = 1; i < lookup.size (); ++i) { @@ -126,7 +126,7 @@ namespace util { util::vector2f bezier<3>::tangent (const float t) const { - CHECK_LIMIT (t, 0, 1); + CHECK_LIMIT (t, 0.f, 1.f); return mix ( mix (m_coeffs[1] - m_coeffs[0], m_coeffs[2] - m_coeffs[1], t), diff --git a/encode/base.hpp b/encode/base.hpp index 3a1157e5..b70eddd2 100644 --- a/encode/base.hpp +++ b/encode/base.hpp @@ -201,10 +201,10 @@ namespace util::encode { throw std::invalid_argument ("base-encoded strings must be a proper multiple of symbols"); auto cursor = std::cbegin (src); - const int groups = std::size (src) / group_symbols; + const auto groups = std::size (src) / group_symbols; const bool padded = std::cend (src)[-1] == '='; - for (int i = 0; i < groups - (padded?1:0); ++i) { + for (size_t i = 0; i < groups - (padded?1:0); ++i) { uint64_t accum = 0; for (int j = 0; j < group_symbols; ++j) { diff --git a/test/iterator.cpp b/test/iterator.cpp index bb9c430b..fcf7a4bb 100644 --- a/test/iterator.cpp +++ b/test/iterator.cpp @@ -17,7 +17,7 @@ main (int, char**) char c_char[] = { 'a', 'b', 'c' }; bool success = true; - for (auto [i, v, a, c]: util::izip (v_int, a_float, c_char)) { + for (const auto &[i, v, a, c]: util::izip (v_int, a_float, c_char)) { success = success && v_int[i] == v && util::exactly_equal (a_float[i], a) &&