Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / solver / detail / SolverQueueItem.h

diff --git a/zypp/solver/detail/SolverQueueItem.h b/zypp/solver/detail/SolverQueueItem.h
index 97b23df..296d47a 100644 (file)
--- a/zypp/solver/detail/SolverQueueItem.h
+++ b/zypp/solver/detail/SolverQueueItem.h
@@ -20,19 +20,22 @@
 
 #ifndef ZYPP_SOLVER_DETAIL_QUEUEITEM_H
 #define ZYPP_SOLVER_DETAIL_QUEUEITEM_H
-#ifndef ZYPP_USE_RESOLVER_INTERNALS
-#error Do not directly include this file!
-#else
 
 #include <iosfwd>
 #include <list>
 #include <string>
 
+#include "zypp/solver/detail/Types.h"
 #include "zypp/base/ReferenceCounted.h"
 #include "zypp/base/NonCopyable.h"
 #include "zypp/base/PtrTypes.h"
 #include "zypp/ResPool.h"
 
+extern "C" {
+  struct _Queue;
+}
+
+
 /////////////////////////////////////////////////////////////////////////
 namespace zypp
 { ///////////////////////////////////////////////////////////////////////
@@ -43,15 +46,6 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
-DEFINE_PTR_TYPE(SolverQueueItem);
-
-DEFINE_PTR_TYPE(SolverQueueItemUpdate);
-DEFINE_PTR_TYPE(SolverQueueItemDelete);
-DEFINE_PTR_TYPE(SolverQueueItemInstall);
-DEFINE_PTR_TYPE(SolverQueueItemInstallOneOf);
-DEFINE_PTR_TYPE(SolverQueueItemLock);
-
-
 typedef enum {
     QUEUE_ITEM_TYPE_UNKNOWN = 0,
     QUEUE_ITEM_TYPE_UPDATE,
@@ -109,7 +103,7 @@ class SolverQueueItem : public base::ReferenceCounted, private base::NonCopyable
 
 
     virtual SolverQueueItem_Ptr copy (void) const = 0;
-    virtual bool addRule (sat::detail::CQueue & q) =0 ;
+    virtual bool addRule (_Queue & q) =0 ;
     virtual int cmp (SolverQueueItem_constPtr item) const = 0;
     int compare (SolverQueueItem_constPtr item) const { return CMP(_type, item->_type); }
 
@@ -124,5 +118,5 @@ class SolverQueueItem : public base::ReferenceCounted, private base::NonCopyable
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // ZYPP_USE_RESOLVER_INTERNALS
+
 #endif // ZYPP_SOLVER_DETAIL_QUEUEITEM_H