Imported Upstream version 16.3.2

[platform/upstream/libzypp.git] / zypp / PoolItemBest.h

diff --git a/zypp/PoolItemBest.h b/zypp/PoolItemBest.h
index 717792e..cf448da 100644 (file)
--- a/zypp/PoolItemBest.h
+++ b/zypp/PoolItemBest.h
@@ -17,7 +17,7 @@
 #include "zypp/base/PtrTypes.h"
 #include "zypp/base/Function.h"
 #include "zypp/base/Iterator.h"
-#include "zypp/base/Tr1hash.h"
+#include "zypp/base/Hash.h"
 
 #include "zypp/PoolItem.h"
 
@@ -39,9 +39,6 @@ namespace zypp
    * sorts the \ref ui::Selectable list of available objects, thus follows the
    * same rules the \ref resolver will apply.
    *
-   * Ctor argument \ref preferNotLocked causes locked packages to be considered
-   * less than not locked packages.
-   *
    * \code
    *   PoolQuery q;
    *   q.addAttribute(sat::SolvAttr::name, "lib*");
@@ -62,7 +59,7 @@ namespace zypp
    */
   class PoolItemBest
   {
-      typedef std::tr1::unordered_map<IdString,PoolItem> Container;
+      typedef std::unordered_map<IdString,PoolItem> Container;
     public:
       /** Predicate returning \c True if \a lhs is a better choice. */
       typedef boost::function<bool ( const PoolItem & lhs, const PoolItem & rhs )> Predicate;
@@ -73,26 +70,22 @@ namespace zypp
       typedef MapKVIteratorTraits<Container>::Key_const_iterator       ident_iterator;
 
     public:
-      /** Indicator argument for ctor: consider locked packages less than not locked packages. */
-      static constexpr bool preferNotLocked = true;
-
-    public:
       /** Default ctor. */
-      PoolItemBest( bool preferNotLocked_r = false )
-      { _ctor_init( preferNotLocked_r ); }
+      PoolItemBest()
+      { _ctor_init(); }
 
       /** Ctor feeding a \ref sat::Solvable. */
-      PoolItemBest( sat::Solvable slv_r, bool preferNotLocked_r = false )
-      { _ctor_init( preferNotLocked_r ); add( slv_r ); }
+      PoolItemBest( sat::Solvable slv_r )
+      { _ctor_init(); add( slv_r ); }
 
       /** Ctor feeding a \ref PoolItem. */
-      PoolItemBest( const PoolItem & pi_r, bool preferNotLocked_r = false )
-      { _ctor_init( preferNotLocked_r ); add( pi_r ); }
+      PoolItemBest( const PoolItem & pi_r )
+      { _ctor_init(); add( pi_r ); }
 
       /** Ctor feeding a range of  \ref sat::Solvable or \ref PoolItem. */
       template<class TIterator>
-      PoolItemBest( TIterator begin_r, TIterator end_r, bool preferNotLocked_r = false )
-      { _ctor_init( preferNotLocked_r ); add( begin_r, end_r ); }
+      PoolItemBest( TIterator begin_r, TIterator end_r )
+      { _ctor_init(); add( begin_r, end_r ); }
 
     public:
       /** Feed one \ref sat::Solvable. */
@@ -103,8 +96,8 @@ namespace zypp
       void add( const PoolItem & pi_r );
 
       /** Feed a range of  \ref sat::Solvable or \ref PoolItem. */
-      template<class _Iterator>
-      void add( _Iterator begin_r, _Iterator end_r )
+      template<class TIterator>
+      void add( TIterator begin_r, TIterator end_r )
       {
         for_( it, begin_r, end_r )
           add( *it );
@@ -139,8 +132,7 @@ namespace zypp
       //@}
 
     private:
-      void _ctor_init( bool preferNotLocked_r );
-      void _ctor_init(/*preferNotLocked = false*/);    ///< bin.compat legacy
+      void _ctor_init();
       const Container & container() const;
     private:
       /** Implementation  */