Imported Upstream version 16.3.2
[platform/upstream/libzypp.git] / zypp / pool / PoolImpl.h
index 9c0aeb5..24249bc 100644 (file)
@@ -179,9 +179,9 @@ namespace zypp
       public:
         /** \name Save and restore state. */
         //@{
-        void SaveState( const ResObject::Kind & kind_r );
+        void SaveState( const ResKind & kind_r );
 
-        void RestoreState( const ResObject::Kind & kind_r );
+        void RestoreState( const ResKind & kind_r );
         //@}
 
         ///////////////////////////////////////////////////////////////////
@@ -264,7 +264,7 @@ namespace zypp
           // Now diff to the pool collecting names only.
           // Thus added and removed locks are not necessarily
           // disjoint. Added locks win.
-          typedef std::tr1::unordered_set<IdString> IdentSet;
+          typedef std::unordered_set<IdString> IdentSet;
           IdentSet addedLocks;
           IdentSet removedLocks;
           for_( it, begin(), end() )