fix gcc warnings

diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc
index 92cf5173513521160137f5840bbf47a6d49e6421..2aaf974ac89f397ea2f93934d13f426d66a9d981 100644 (file)
--- 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 1c03903e157e44cb4285c3340b6e798fed3bc0a1..11a74358ec97779bfe2d1610876ee3ee2f6baf4c 100644 (file)
--- 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() );
     }