Imported Upstream version 16.3.2

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

diff --git a/zypp/sat/detail/PoolMember.h b/zypp/sat/detail/PoolMember.h
index 6819e51..9573098 100644 (file)
--- a/zypp/sat/detail/PoolMember.h
+++ b/zypp/sat/detail/PoolMember.h
@@ -12,9 +12,7 @@
 #ifndef ZYPP_SAT_DETAIL_POOLMEMBER_H
 #define ZYPP_SAT_DETAIL_POOLMEMBER_H
 
-#include <solv/solvversion.h>
-
-#include "zypp/base/Tr1hash.h"
+#include "zypp/base/Hash.h"
 #include "zypp/base/Iterator.h"
 #include "zypp/base/String.h"
 #include "zypp/base/Easy.h"
@@ -22,17 +20,6 @@
 extern "C"
 {
   // Those _Type names are exposed as sat::detail::CType below!
-#if ( LIBSOLV_VERSION >= 700 )
-  struct s_Dataiterator;
-  struct s_Datamatcher;
-  struct s_Map;
-  struct s_Pool;
-  struct s_Queue;
-  struct s_Repo;
-  struct s_Solvable;
-  struct s_Solver;
-  struct s_Transaction;
-#else
   struct _Dataiterator;
   struct _Datamatcher;
   struct _Map;
@@ -42,7 +29,6 @@ extern "C"
   struct _Solvable;
   struct _Solver;
   struct _Transaction;
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -69,17 +55,6 @@ namespace zypp
     ///////////////////////////////////////////////////////////////////
     namespace detail
     {
-#if ( LIBSOLV_VERSION >= 700 )
-      typedef ::s_Dataiterator CDataiterator;  ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::s_Datamatcher  CDatamatcher;   ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::s_Map          CMap;           ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::s_Pool         CPool;          ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::s_Queue                CQueue;         ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::s_Repo         CRepo;          ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::s_Solvable     CSolvable;      ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::s_Solver       CSolver;        ///< Wrapped libsolv C data type exposed as backdoor
-      typedef ::s_Transaction  CTransaction;   ///< Wrapped libsolv C data type exposed as backdoor
-#else
       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
@@ -89,7 +64,6 @@ namespace zypp
       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
-#endif
     } // namespace detail
     ///////////////////////////////////////////////////////////////////
 
@@ -136,6 +110,11 @@ 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 ); }
@@ -151,7 +130,7 @@ namespace zypp
       static const SolvableIdType systemSolvableId( 1 );
 
       /** Id type to connect \ref Repo and sat-repo. */
-      typedef CRepo * RepoIdType;
+      typedef ::_Repo * RepoIdType;
       /** Id to denote \ref Repo::noRepository. */
       static const RepoIdType noRepoId( 0 );