From 385cf37cf084198e3aedb4354a7b025938a9f11b Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 17 Jul 2014 18:22:07 -0400 Subject: [PATCH] Fix hb_in_range() unused-var warning on Windows --- src/hb-private.hh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/hb-private.hh b/src/hb-private.hh index 2e2edb2da..a451d164f 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -795,7 +795,13 @@ template <> class hb_assert_unsigned_t {}; template static inline bool hb_in_range (T u, T lo, T hi) { - hb_assert_unsigned_t error_hb_in_range_called_with_signed_type HB_UNUSED; + /* The sizeof() is here to force template instantiation. + * I'm sure there are better ways to do this but can't think of + * one right now. Declaring a variable won't work as HB_UNUSED + * is unsable on some platforms and unused types are less likely + * to generate a warning than unused variables. */ + ASSERT_STATIC (sizeof (hb_assert_unsigned_t) >= 0); + return (u - lo) <= (hi - lo); }