Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / Locks.cc

diff --git a/zypp/Locks.cc b/zypp/Locks.cc
index b4ff9d5..721a1cc 100644 (file)
--- a/zypp/Locks.cc
+++ b/zypp/Locks.cc
@@ -29,7 +29,9 @@
 
 #include "zypp/Locks.h"
 
-using std::endl;
+using namespace std;
+using namespace zypp;
+using namespace zypp::str;
 
 namespace zypp
 {
@@ -71,10 +73,11 @@ struct ApplyLock
 {
   void operator()(const PoolQuery& query) const
   {
-    for ( const PoolItem & item : query.poolItem() )
+    for_( it,query.begin(),query.end() )
     {
+      PoolItem item(*it);
       item.status().setLock(true,ResStatus::USER);
-      DBG << "lock "<< item.name();
+      DBG << "lock "<< item.resolvable()->name();
     }
   }
 };
@@ -106,8 +109,9 @@ void Locks::readAndApply( const Pathname& file )
   PathInfo pinfo(file);
   if ( pinfo.isExist() )
   {
-    std::insert_iterator<LockList> ii( _pimpl->locks, _pimpl->locks.end() );
-    LockingOutputIterator<std::insert_iterator<LockList> > lout(ii);
+    insert_iterator<LockList> ii( _pimpl->locks,
+        _pimpl->locks.end() );
+    LockingOutputIterator<insert_iterator<LockList> > lout(ii);
     readPoolQueriesFromFile( file, boost::make_function_output_iterator(lout) );
   }
   else
@@ -120,7 +124,8 @@ void Locks::read( const Pathname& file )
   MIL << "read locks from "<<file << endl;
   PathInfo pinfo(file);
   if ( pinfo.isExist() )
-    readPoolQueriesFromFile( file, std::insert_iterator<LockList>(_pimpl->locks, _pimpl->locks.end()) );
+    readPoolQueriesFromFile(
+       file, insert_iterator<LockList>(_pimpl->locks, _pimpl->locks.end()) );
   else 
     MIL << "file not exist(or cannot be stat), no lock added." << endl;
 }