cleanup in DEFINE_PTR_TYPE

diff --git a/zypp/solver/detail/SolverQueueItem.h b/zypp/solver/detail/SolverQueueItem.h
index bfa5f08056cd11d6c0f64b93956d59843e348ca3..30b463fe4699e066ec1706f4a13a980a93bdb897 100644 (file)
--- a/zypp/solver/detail/SolverQueueItem.h
+++ b/zypp/solver/detail/SolverQueueItem.h
@@ -25,6 +25,7 @@
 #include <list>
 #include <string>
 
 #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/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;
 
     QUEUE_ITEM_TYPE_INSTALL_ONE_OF,    
 } SolverQueueItemType;
 

-DEFINE_PTR_TYPE(SolverQueueItem);

        
 typedef std::list<SolverQueueItem_Ptr> SolverQueueItemList;
 
        
 typedef std::list<SolverQueueItem_Ptr> SolverQueueItemList;
 

diff --git a/zypp/solver/detail/SolverQueueItemDelete.h b/zypp/solver/detail/SolverQueueItemDelete.h
index 7580a9b2bf88b8b25d1ca2462ffcb21ad082ae2f..29adeb8e41590184ff4b3ef4312fa8cc58e0513f 100644 (file)
--- a/zypp/solver/detail/SolverQueueItemDelete.h
+++ b/zypp/solver/detail/SolverQueueItemDelete.h
@@ -37,8 +37,6 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 

-DEFINE_PTR_TYPE(SolverQueueItemDelete);
-       

 
 ///////////////////////////////////////////////////////////////////
 //
 
 ///////////////////////////////////////////////////////////////////
 //

diff --git a/zypp/solver/detail/SolverQueueItemInstall.h b/zypp/solver/detail/SolverQueueItemInstall.h
index 44ee3cd05bc362c0a17b4024e9f738883e938023..06220ba612601ac0f2e5ba4a863f85b80ce0802e 100644 (file)
--- a/zypp/solver/detail/SolverQueueItemInstall.h
+++ b/zypp/solver/detail/SolverQueueItemInstall.h
@@ -36,8 +36,6 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 

-DEFINE_PTR_TYPE(SolverQueueItemInstall);
-       

 
 ///////////////////////////////////////////////////////////////////
 //
 
 ///////////////////////////////////////////////////////////////////
 //

diff --git a/zypp/solver/detail/SolverQueueItemInstallOneOf.h b/zypp/solver/detail/SolverQueueItemInstallOneOf.h
index 78f806b62c7cee8876c0b8ac0927c216346b0f40..5a8f27498d3ee6091754efaf4f82b6504ea08d48 100644 (file)
--- a/zypp/solver/detail/SolverQueueItemInstallOneOf.h
+++ b/zypp/solver/detail/SolverQueueItemInstallOneOf.h
@@ -36,9 +36,6 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 

-DEFINE_PTR_TYPE(SolverQueueItemInstallOneOf);
-       
-

 ///////////////////////////////////////////////////////////////////
 //
 //     CLASS NAME : SolverQueueItemInstallOneOf
 ///////////////////////////////////////////////////////////////////
 //
 //     CLASS NAME : SolverQueueItemInstallOneOf

diff --git a/zypp/solver/detail/SolverQueueItemUpdate.h b/zypp/solver/detail/SolverQueueItemUpdate.h
index 1fd3ce57b04fa2ec2c3975bb5460a0727049873d..c307b7ed4058ee40a43f403beeba665254536f6e 100644 (file)
--- a/zypp/solver/detail/SolverQueueItemUpdate.h
+++ b/zypp/solver/detail/SolverQueueItemUpdate.h
@@ -37,9 +37,6 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 

-DEFINE_PTR_TYPE(SolverQueueItemUpdate);
-       
-

 ///////////////////////////////////////////////////////////////////
 //
 //     CLASS NAME : SolverQueueItemUpdate
 ///////////////////////////////////////////////////////////////////
 //
 //     CLASS NAME : SolverQueueItemUpdate

diff --git a/zypp/solver/detail/Types.h b/zypp/solver/detail/Types.h
index b24ebad7e599a31b70c91adda6639b97f424a202..8bb9b4beaa3d91d7bfaf81ee768a22d979a1c3ae 100644 (file)
--- a/zypp/solver/detail/Types.h
+++ b/zypp/solver/detail/Types.h
@@ -58,7 +58,11 @@ typedef std::list<SolutionAction_Ptr> SolutionActionList;
 typedef std::list<SolutionAction_constPtr> CSolutionActionList;
 DEFINE_PTR_TYPE(TransactionSolutionAction);
 DEFINE_PTR_TYPE(InjectSolutionAction);
 typedef std::list<SolutionAction_constPtr> 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
       
       ///////////////////////////////////////////////////////////////////
     };// namespace detail