From: Stefan Schubert Date: Tue, 15 Apr 2008 09:16:47 +0000 (+0000) Subject: cleanup in DEFINE_PTR_TYPE X-Git-Tag: 6.6.0~1052 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38f02085b919767ce9098faf639c77ffc214be39;p=platform%2Fupstream%2Flibzypp.git cleanup in DEFINE_PTR_TYPE --- diff --git a/zypp/solver/detail/SolverQueueItem.h b/zypp/solver/detail/SolverQueueItem.h index bfa5f0805..30b463fe4 100644 --- a/zypp/solver/detail/SolverQueueItem.h +++ b/zypp/solver/detail/SolverQueueItem.h @@ -25,6 +25,7 @@ #include #include +#include "zypp/solver/detail/Types.h" #include "zypp/base/ReferenceCounted.h" #include "zypp/base/NonCopyable.h" #include "zypp/base/PtrTypes.h" @@ -48,7 +49,6 @@ typedef enum { QUEUE_ITEM_TYPE_INSTALL_ONE_OF, } SolverQueueItemType; -DEFINE_PTR_TYPE(SolverQueueItem); typedef std::list SolverQueueItemList; diff --git a/zypp/solver/detail/SolverQueueItemDelete.h b/zypp/solver/detail/SolverQueueItemDelete.h index 7580a9b2b..29adeb8e4 100644 --- a/zypp/solver/detail/SolverQueueItemDelete.h +++ b/zypp/solver/detail/SolverQueueItemDelete.h @@ -37,8 +37,6 @@ namespace zypp namespace detail { /////////////////////////////////////////////////////////////////// -DEFINE_PTR_TYPE(SolverQueueItemDelete); - /////////////////////////////////////////////////////////////////// // diff --git a/zypp/solver/detail/SolverQueueItemInstall.h b/zypp/solver/detail/SolverQueueItemInstall.h index 44ee3cd05..06220ba61 100644 --- a/zypp/solver/detail/SolverQueueItemInstall.h +++ b/zypp/solver/detail/SolverQueueItemInstall.h @@ -36,8 +36,6 @@ namespace zypp namespace detail { /////////////////////////////////////////////////////////////////// -DEFINE_PTR_TYPE(SolverQueueItemInstall); - /////////////////////////////////////////////////////////////////// // diff --git a/zypp/solver/detail/SolverQueueItemInstallOneOf.h b/zypp/solver/detail/SolverQueueItemInstallOneOf.h index 78f806b62..5a8f27498 100644 --- a/zypp/solver/detail/SolverQueueItemInstallOneOf.h +++ b/zypp/solver/detail/SolverQueueItemInstallOneOf.h @@ -36,9 +36,6 @@ namespace zypp namespace detail { /////////////////////////////////////////////////////////////////// -DEFINE_PTR_TYPE(SolverQueueItemInstallOneOf); - - /////////////////////////////////////////////////////////////////// // // CLASS NAME : SolverQueueItemInstallOneOf diff --git a/zypp/solver/detail/SolverQueueItemUpdate.h b/zypp/solver/detail/SolverQueueItemUpdate.h index 1fd3ce57b..c307b7ed4 100644 --- a/zypp/solver/detail/SolverQueueItemUpdate.h +++ b/zypp/solver/detail/SolverQueueItemUpdate.h @@ -37,9 +37,6 @@ namespace zypp namespace detail { /////////////////////////////////////////////////////////////////// -DEFINE_PTR_TYPE(SolverQueueItemUpdate); - - /////////////////////////////////////////////////////////////////// // // CLASS NAME : SolverQueueItemUpdate diff --git a/zypp/solver/detail/Types.h b/zypp/solver/detail/Types.h index b24ebad7e..8bb9b4bea 100644 --- a/zypp/solver/detail/Types.h +++ b/zypp/solver/detail/Types.h @@ -58,7 +58,11 @@ typedef std::list SolutionActionList; typedef std::list CSolutionActionList; DEFINE_PTR_TYPE(TransactionSolutionAction); DEFINE_PTR_TYPE(InjectSolutionAction); - +DEFINE_PTR_TYPE(SolverQueueItem); +DEFINE_PTR_TYPE(SolverQueueItemUpdate); +DEFINE_PTR_TYPE(SolverQueueItemDelete); +DEFINE_PTR_TYPE(SolverQueueItemInstall); +DEFINE_PTR_TYPE(SolverQueueItemInstallOneOf); /////////////////////////////////////////////////////////////////// };// namespace detail