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 6fd11e1..0cd0fdc 100644 (file)
--- a/zypp/sat/detail/PoolMember.h
+++ b/zypp/sat/detail/PoolMember.h
@@ -12,7 +12,10 @@
 #ifndef ZYPP_SAT_DETAIL_POOLMEMBER_H
 #define ZYPP_SAT_DETAIL_POOLMEMBER_H
 
+#include "zypp/base/Tr1hash.h"
 #include "zypp/base/Iterator.h"
+#include "zypp/base/String.h"
+#include "zypp/base/Easy.h"
 
 extern "C"
 {
@@ -24,16 +27,26 @@ struct _Pool;
 ///////////////////////////////////////////////////////////////////
 namespace zypp
 { /////////////////////////////////////////////////////////////////
+
+  class IdString;
+  class Capability;
+  class Capabilities;
+  class Repository;
+  class RepoInfo;
+
+  ///////////////////////////////////////////////////////////////////
+  namespace detail
+  {
+    class RepoIterator;
+    class ByRepository;
+  }
+
   ///////////////////////////////////////////////////////////////////
   namespace sat
   { /////////////////////////////////////////////////////////////////
 
-    class IdStr;
-    class Capability;
-    class Capabilities;
-    class Solvable;
-    class Repo;
     class Pool;
+    class Solvable;
 
     ///////////////////////////////////////////////////////////////////
     namespace detail
@@ -68,17 +81,30 @@ namespace zypp
       /** Generic Id type. */
       typedef int IdType;
       static const IdType noId( 0 );
+      static const IdType emptyId( 1 );
+
+      /** Internal ids satlib includes in dependencies.
+       * MPL check in PoolImpl.cc
+      */
+      static const IdType solvablePrereqMarker( 15 );
+      static const IdType solvableFileMarker  ( 16 );
+      /** Test for internal ids satlib includes in dependencies. */
+      inline bool isDepMarkerId( IdType id_r )
+      { return( id_r == solvablePrereqMarker || id_r == solvableFileMarker ); }
 
       /** Id type to connect \ref Solvable and sat-solvable.
        * Indext into solvable array.
       */
       typedef unsigned SolvableIdType;
-      /** Id to denote \ref Solvable::nosolvable. */
+      typedef SolvableIdType size_type;
+      /** Id to denote \ref Solvable::noSolvable. */
       static const SolvableIdType noSolvableId( 0 );
+      /** Id to denote the usually hidden \ref Solvable::systemSolvable. */
+      static const SolvableIdType systemSolvableId( 1 );
 
       /** Id type to connect \ref Repo and sat-repo. */
       typedef ::_Repo * RepoIdType;
-      /** Id to denote \ref Repo::nosolvable. */
+      /** Id to denote \ref Repo::noRepository. */
       static const RepoIdType noRepoId( 0 );
 
       /////////////////////////////////////////////////////////////////
@@ -91,21 +117,11 @@ namespace zypp
     { /////////////////////////////////////////////////////////////////
 
       class SolvableIterator;
-      class RepoIterator;
-      class ByRepo;
 
       /////////////////////////////////////////////////////////////////
     } // namespace detail
     ///////////////////////////////////////////////////////////////////
 
-    ///////////////////////////////////////////////////////////////////
-    typedef IdStr KindId;
-    typedef IdStr NameId;
-    typedef IdStr EvrId;
-    typedef IdStr ArchId;
-    typedef IdStr VendorId;
-    ///////////////////////////////////////////////////////////////////
-
     /////////////////////////////////////////////////////////////////
   } // namespace sat
   ///////////////////////////////////////////////////////////////////