Imported Upstream version 14.47.1

[platform/upstream/libzypp.git] / zypp / sat / LookupAttr.cc

diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc
index d3fb410..0bf8cdf 100644 (file)
--- a/zypp/sat/LookupAttr.cc
+++ b/zypp/sat/LookupAttr.cc
@@ -383,7 +383,6 @@ namespace zypp
     {
       switch ( solvAttrType() )
       {
-        case REPOKEY_TYPE_U32:
         case REPOKEY_TYPE_NUM:
         case REPOKEY_TYPE_CONSTANT:
           return true;
@@ -547,7 +546,6 @@ namespace zypp
       {
         switch ( solvAttrType() )
         {
-          case REPOKEY_TYPE_U32:
           case REPOKEY_TYPE_NUM:
           case REPOKEY_TYPE_CONSTANT:
             return _dip->kv.num;
@@ -566,7 +564,6 @@ namespace zypp
       {
         switch ( solvAttrType() )
         {
-          case REPOKEY_TYPE_U32:
           case REPOKEY_TYPE_NUM:
           case REPOKEY_TYPE_CONSTANT:
             return SOLV_KV_NUM64(&_dip->kv);
@@ -634,7 +631,6 @@ namespace zypp
             }
             break;
 
-          case REPOKEY_TYPE_U32:
           case REPOKEY_TYPE_NUM:
           case REPOKEY_TYPE_CONSTANT:
             return str::numstring( asInt() );
@@ -753,7 +749,7 @@ namespace zypp
 
     ///////////////////////////////////////////////////////////////////
 
-    bool LookupAttr::iterator::dip_equal( const ::_Dataiterator & lhs, const ::_Dataiterator & rhs ) const
+    bool LookupAttr::iterator::dip_equal( const detail::CDataiterator & lhs, const detail::CDataiterator & rhs ) const
     {
       // Iterator equal is same position in same container.
       // Here: same attribute in same solvable.
@@ -784,7 +780,7 @@ namespace zypp
 
     std::ostream & operator<<( std::ostream & str, const LookupAttr::iterator & obj )
     {
-      const ::_Dataiterator * dip = obj.get();
+      const detail::CDataiterator * dip = obj.get();
       if ( ! dip )
         return str << "EndOfQuery";
 
@@ -808,9 +804,9 @@ namespace zypp
 } // namespace zypp
 ///////////////////////////////////////////////////////////////////
 
-std::ostream & operator<<( std::ostream & str, const ::_Dataiterator * obj )
+std::ostream & operator<<( std::ostream & str, const zypp::sat::detail::CDataiterator * obj )
 {
-  str << "::_Dataiterator(";
+  str << "detail::CDataiterator(";
   if ( ! obj )
   {
     str << "NULL";