Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / sat / detail / PoolMember.h

diff --git a/zypp/sat/detail/PoolMember.h b/zypp/sat/detail/PoolMember.h
index 9573098..0cd0fdc 100644 (file)
--- a/zypp/sat/detail/PoolMember.h
+++ b/zypp/sat/detail/PoolMember.h
@@ -12,23 +12,16 @@
 #ifndef ZYPP_SAT_DETAIL_POOLMEMBER_H
 #define ZYPP_SAT_DETAIL_POOLMEMBER_H
 
-#include "zypp/base/Hash.h"
+#include "zypp/base/Tr1hash.h"
 #include "zypp/base/Iterator.h"
 #include "zypp/base/String.h"
 #include "zypp/base/Easy.h"
 
 extern "C"
 {
-  // Those _Type names are exposed as sat::detail::CType below!
-  struct _Dataiterator;
-  struct _Datamatcher;
-  struct _Map;
-  struct _Pool;
-  struct _Queue;
-  struct _Repo;
-  struct _Solvable;
-  struct _Solver;
-  struct _Transaction;
+struct _Solvable;
+struct _Repo;
+struct _Pool;
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -52,21 +45,6 @@ namespace zypp
   namespace sat
   { /////////////////////////////////////////////////////////////////
 
-    ///////////////////////////////////////////////////////////////////
-    namespace detail
-    {
-      typedef ::_Dataiterator  CDataiterator;  ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::_Datamatcher   CDatamatcher;   ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::_Map           CMap;           ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::_Pool          CPool;          ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::_Queue         CQueue;         ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::_Repo          CRepo;          ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::_Solvable      CSolvable;      ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::_Solver                CSolver;        ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::_Transaction   CTransaction;   ///< Wrapped libsolv C data type exposed as backdoor
-    } // namespace detail
-    ///////////////////////////////////////////////////////////////////
-
     class Pool;
     class Solvable;
 
@@ -110,11 +88,6 @@ namespace zypp
       */
       static const IdType solvablePrereqMarker( 15 );
       static const IdType solvableFileMarker  ( 16 );
-
-      static const IdType namespaceModalias    ( 18 );
-      static const IdType namespaceLanguage    ( 20 );
-      static const IdType namespaceFilesystem  ( 21 );
-
       /** Test for internal ids satlib includes in dependencies. */
       inline bool isDepMarkerId( IdType id_r )
       { return( id_r == solvablePrereqMarker || id_r == solvableFileMarker ); }