From f5f4be355a65825de06a3c20c76f5b74c1f20837 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 26 Feb 2013 20:07:44 -0800 Subject: explicit cast of enumerations clang (correctly) flags the non-cast values as being tautological (as they are outside the enumerated values). Explicitly cast the values to the enumeration for the error condition checks. --- paludis/environments/paludis/output_conf.cc | 4 ++-- paludis/repositories/e/e_repository_sets.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc index ccd5f51b8..888cb0370 100644 --- a/paludis/environments/paludis/output_conf.cc +++ b/paludis/environments/paludis/output_conf.cc @@ -173,7 +173,7 @@ namespace if (rule.action_requirement() != "*" && rule.action_requirement() != "sync") return false; - if (-1 != rule.output_exclusivity_requirement() && + if (static_cast(-1) != rule.output_exclusivity_requirement() && rule.output_exclusivity_requirement() != i.output_exclusivity()) return false; @@ -197,7 +197,7 @@ namespace if (rule.action_requirement() != "*" && rule.action_requirement() != i.action_name()) return false; - if (-1 != rule.output_exclusivity_requirement() && + if (static_cast(-1) != rule.output_exclusivity_requirement() && rule.output_exclusivity_requirement() != i.output_exclusivity()) return false; diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc index 496258bdb..2f60c1def 100644 --- a/paludis/repositories/e/e_repository_sets.cc +++ b/paludis/repositories/e/e_repository_sets.cc @@ -210,7 +210,7 @@ namespace if (r.op() == "ge") our_op = vo_greater_equal; - if (-1 != our_op) + if (static_cast(-1) != our_op) return (VersionOperator(our_op).as_version_spec_comparator()(id->version(), VersionSpec(ver, ver_options))); if (0 == r.op().compare(0, 1, "r")) -- cgit v1.2.3