From 1f37ea0151d021b542cfa62e0614a599c4975a45 Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Wed, 3 Oct 2007 11:36:20 +0000 Subject: [PATCH] Fixed warnings about explicit operator precedence and member initailization order. --- zypp/Pathname.cc | 4 ++-- zypp/cache/ResolvableQuery.cc | 2 +- zypp/solver/detail/ResolverUpgrade.cc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zypp/Pathname.cc b/zypp/Pathname.cc index 9ad4ebb..9d4b081 100644 --- a/zypp/Pathname.cc +++ b/zypp/Pathname.cc @@ -145,8 +145,8 @@ namespace zypp // check for prefix if ( name_t.length() >= 2 && name_t[1] == ':' - && ( 'a' <= name_t[0] && name_t[0] <= 'z' - || 'A' <= name_t[0] && name_t[0] <= 'Z' ) ) { + && ( ( 'a' <= name_t[0] && name_t[0] <= 'z' ) + || ( 'A' <= name_t[0] && name_t[0] <= 'Z' ) ) ) { Tprfx = name_t.substr( 0, 2 ); prfx_i = 2; R_pci += 2; diff --git a/zypp/cache/ResolvableQuery.cc b/zypp/cache/ResolvableQuery.cc index 313ceb5..175630e 100644 --- a/zypp/cache/ResolvableQuery.cc +++ b/zypp/cache/ResolvableQuery.cc @@ -221,7 +221,7 @@ struct ResolvableQuery::Impl //FIXME: Implement MATCH_RESSUMM and MATCH_RESDESC sqlcmd += " name "; - if (flags & MATCH_WILDCARDS == 0) + if ((flags & MATCH_WILDCARDS) == 0) { sqlcmd += "="; } diff --git a/zypp/solver/detail/ResolverUpgrade.cc b/zypp/solver/detail/ResolverUpgrade.cc index ffb95e0..15c0429 100644 --- a/zypp/solver/detail/ResolverUpgrade.cc +++ b/zypp/solver/detail/ResolverUpgrade.cc @@ -268,8 +268,8 @@ class LookForSelected : public resfilter::PoolItemFilterFunctor PoolItem_Ref candidate; LookForSelected (PoolItem_Ref can) - : candidate (can), - found (false) + : found (false), + candidate (can) { } bool operator()( PoolItem_Ref item ) -- 2.7.4