From e22c7cb108a812a72d1e81a96f60edccdb6735c9 Mon Sep 17 00:00:00 2001 From: Mateusz Loskot Date: Sat, 19 Jan 2019 15:05:35 +0100 Subject: [PATCH] Fix GCC -Wsign-compare warning in tests (#217) Fixes at least two warnings issued by channel tests due to comparison of unsigned channel value with signed integer 1: ../../boost/test/tools/assertion.hpp:72:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] --- test/channel/algorithm_channel_arithmetic.cpp | 13 +++++++------ test/channel/algorithm_channel_relation.cpp | 8 ++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/test/channel/algorithm_channel_arithmetic.cpp b/test/channel/algorithm_channel_arithmetic.cpp index 78ee3a575..e569096d8 100644 --- a/test/channel/algorithm_channel_arithmetic.cpp +++ b/test/channel/algorithm_channel_arithmetic.cpp @@ -27,6 +27,7 @@ void test_channel_arithmetic_mutable(boost::mpl::true_) using channel_value_t = typename fixture_t::channel_value_t; fixture_t f; channel_value_t const v = f.min_v_; + channel_value_t const one = 1; ++f.min_v_; f.min_v_++; @@ -34,16 +35,16 @@ void test_channel_arithmetic_mutable(boost::mpl::true_) f.min_v_--; BOOST_TEST(v == f.min_v_); - f.min_v_ += 1; - f.min_v_ -= 1; + f.min_v_ += one; + f.min_v_ -= one; BOOST_TEST(v == f.min_v_); - f.min_v_ *= 1; - f.min_v_ /= 1; + f.min_v_ *= one; + f.min_v_ /= one; BOOST_TEST(v == f.min_v_); - f.min_v_ = 1; // assignable to scalar - BOOST_TEST(f.min_v_ == 1); + f.min_v_ = one; // assignable to scalar + BOOST_TEST(f.min_v_ == one); f.min_v_ = v; // and to value type BOOST_TEST(f.min_v_ == v); diff --git a/test/channel/algorithm_channel_relation.cpp b/test/channel/algorithm_channel_relation.cpp index 4fab441a9..258ffce99 100644 --- a/test/channel/algorithm_channel_relation.cpp +++ b/test/channel/algorithm_channel_relation.cpp @@ -18,14 +18,18 @@ namespace fixture = boost::gil::test::fixture; template void test_channel_relation() { - fixture::channel f; + using fixture_t = fixture::channel; + using channel_value_t = typename fixture_t::channel_value_t; + channel_value_t const one = 1; + + fixture_t f; BOOST_TEST(f.min_v_ <= f.max_v_); BOOST_TEST(f.max_v_ >= f.min_v_); BOOST_TEST(f.min_v_ < f.max_v_); BOOST_TEST(f.max_v_ > f.min_v_); BOOST_TEST(f.max_v_ != f.min_v_); BOOST_TEST(f.min_v_ == f.min_v_); - BOOST_TEST(f.min_v_ != 1); // comparable to integral + BOOST_TEST(f.min_v_ != one); // comparable to integral } BOOST_AUTO_TEST_CASE_TEMPLATE(channel_value, Channel, fixture::channel_byte_types)