Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / sat / SolvIterMixin.h

diff --git a/zypp/sat/SolvIterMixin.h b/zypp/sat/SolvIterMixin.h
index 4419222..811d60e 100644 (file)
--- a/zypp/sat/SolvIterMixin.h
+++ b/zypp/sat/SolvIterMixin.h
@@ -16,7 +16,7 @@
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/base/Iterator.h"
-#include "zypp/base/Hash.h"
+#include "zypp/base/Tr1hash.h"
 
 #include "zypp/sat/Solvable.h"
 
@@ -50,7 +50,7 @@ namespace zypp
       {
         bool operator()( const Solvable & solv_r ) const;
 
-        typedef std::unordered_set<unsigned> Uset;
+        typedef std::tr1::unordered_set<unsigned> Uset;
         UnifyByIdent()
           : _uset( new Uset )
         {}
@@ -139,8 +139,8 @@ namespace zypp
         { size_type s = 0; for_( it, self().begin(), self().end() ) ++s; return s;}
 
        /** Whether collection contains a specific \ref Solvable. */
-       template<class TSolv>
-       bool contains( const TSolv & solv_r ) const
+       template<class _Solv>
+       bool contains( const _Solv & solv_r ) const
        {
          Solvable solv( asSolvable()( solv_r ) );
          for_( it, self().begin(), self().end() )
@@ -158,8 +158,6 @@ namespace zypp
         { return self().begin(); }
         Solvable_iterator solvableEnd() const
         { return self().end(); }
-       Iterable<Solvable_iterator> solvable() const
-       { return makeIterable( solvableBegin(), solvableEnd() ); }
         //@}
 
         /** \name Iterate as PoolItem */
@@ -169,8 +167,6 @@ namespace zypp
         { return make_transform_iterator( solvableBegin(), asPoolItem() ); }
         PoolItem_iterator poolItemEnd() const
         { return make_transform_iterator( solvableEnd(), asPoolItem() ); }
-       Iterable<PoolItem_iterator> poolItem() const
-       { return makeIterable( poolItemBegin(), poolItemEnd() ); }
         //@}
 
       private:
@@ -183,8 +179,6 @@ namespace zypp
         { return make_transform_iterator( unifiedSolvableBegin(), ui::asSelectable() ); }
         Selectable_iterator selectableEnd() const
         { return make_transform_iterator( unifiedSolvableEnd(), ui::asSelectable() ); }
-       Iterable<Selectable_iterator> selectable() const
-       { return makeIterable( selectableBegin(), selectableEnd() ); }
         //@}
 
       private:
@@ -193,9 +187,7 @@ namespace zypp
         UnifiedSolvable_iterator unifiedSolvableBegin() const
         { return make_filter_iterator( solvitermixin_detail::UnifyByIdent(), solvableBegin(), solvableEnd() ); }
         UnifiedSolvable_iterator unifiedSolvableEnd() const
-        { return make_filter_iterator( solvitermixin_detail::UnifyByIdent(), solvableEnd(), solvableEnd() ); }
-       Iterable<UnifiedSolvable_iterator> unifiedSolvable() const
-       { return makeIterable( unifiedSolvableBegin(), unifiedSolvableEnd() ); }
+        { return make_filter_iterator( solvitermixin_detail::UnifyByIdent(), solvableEnd(), solvableEnd() );; }
         //@}
       private:
         const Derived & self() const