From 808dcc599115f813ba3939ce9f8e2056ec32cc4a Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Sun, 28 Apr 2013 00:03:37 +0200 Subject: [PATCH] fix gcc warnings --- zypp/PoolQuery.cc | 6 +++--- zypp/ZYppFactory.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc index 92cf51735..2aaf974ac 100644 --- a/zypp/PoolQuery.cc +++ b/zypp/PoolQuery.cc @@ -407,11 +407,11 @@ namespace zypp // We unify those two forms to enable zypper to remove zypp locks // without need to actually evaluate the query (which would require // repos to be loaded). - || ( _flags.isModeString() && rhs._flags.isModeGlob() - || _flags.isModeGlob() && rhs._flags.isModeString() ) + || ( ( _flags.isModeString() && rhs._flags.isModeGlob() + || _flags.isModeGlob() && rhs._flags.isModeString() ) && _strings.empty() && _attrs.size() == 1 - && _attrs.begin()->first == sat::SolvAttr::name ) + && _attrs.begin()->first == sat::SolvAttr::name ) ) { return ( _strings == rhs._strings && _attrs == rhs._attrs diff --git a/zypp/ZYppFactory.cc b/zypp/ZYppFactory.cc index 1c03903e1..11a74358e 100644 --- a/zypp/ZYppFactory.cc +++ b/zypp/ZYppFactory.cc @@ -87,10 +87,10 @@ namespace zypp { public: ZYppGlobalLock() - : _cleanLock( false ) - , _zyppLockFilePath( env::ZYPP_LOCKFILE_ROOT() / "/var/run/zypp.pid" ) + : _zyppLockFilePath( env::ZYPP_LOCKFILE_ROOT() / "/var/run/zypp.pid" ) , _zyppLockFile( NULL ) , _lockerPid( 0 ) + , _cleanLock( false ) { filesystem::assert_dir(_zyppLockFilePath.dirname() ); } -- 2.34.1