Author: jkupec Date: Fri Sep 5 10:03:05 2008 New Revision: 10939 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10939&view=rev Log: - use shared_ptr instead of the intrusive one Modified: trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoInfo.h trunk/libzypp/zypp/ServiceInfo.cc trunk/libzypp/zypp/ServiceInfo.h trunk/libzypp/zypp/repo/RepoInfoBase.cc trunk/libzypp/zypp/repo/RepoInfoBase.h Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=10939&r1=10938&r2=10939&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Fri Sep 5 10:03:05 2008 @@ -91,8 +91,6 @@ // /////////////////////////////////////////////////////////////////// - IMPL_PTR_TYPE(RepoInfo); - /////////////////////////////////////////////////////////////////// // // METHOD NAME : RepoInfo::RepoInfo Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=10939&r1=10938&r2=10939&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Fri Sep 5 10:03:05 2008 @@ -28,8 +28,6 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - DEFINE_PTR_TYPE(RepoInfo); - /////////////////////////////////////////////////////////////////// // // CLASS NAME : RepoInfo @@ -341,6 +339,8 @@ inline bool operator<( const RepoInfo& lhs, const RepoInfo & rhs ) { return lhs.alias() < rhs.alias(); } + typedef shared_ptr<RepoInfo> RepoInfo_Ptr; + typedef std::list<RepoInfo> RepoInfoList; ///////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/ServiceInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ServiceInfo.cc?rev=10939&r1=10938&r2=10939&view=diff ============================================================================== --- trunk/libzypp/zypp/ServiceInfo.cc (original) +++ trunk/libzypp/zypp/ServiceInfo.cc Fri Sep 5 10:03:05 2008 @@ -68,8 +68,6 @@ // /////////////////////////////////////////////////////////////////// - IMPL_PTR_TYPE(ServiceInfo); - const ServiceInfo ServiceInfo::noService; ServiceInfo::ServiceInfo() : _pimpl( new Impl() ) {} Modified: trunk/libzypp/zypp/ServiceInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ServiceInfo.h?rev=10939&r1=10938&r2=10939&view=diff ============================================================================== --- trunk/libzypp/zypp/ServiceInfo.h (original) +++ trunk/libzypp/zypp/ServiceInfo.h Fri Sep 5 10:03:05 2008 @@ -23,8 +23,6 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - DEFINE_PTR_TYPE(ServiceInfo); - /////////////////////////////////////////////////////////////////// // // CLASS NAME : ServiceInfo @@ -93,6 +91,8 @@ }; /////////////////////////////////////////////////////////////////// + typedef shared_ptr<ServiceInfo> ServiceInfo_Ptr; + /** \relates ServiceInfo Stream output */ std::ostream & operator<<( std::ostream & str, const ServiceInfo & obj ); Modified: trunk/libzypp/zypp/repo/RepoInfoBase.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoInfoBase.cc?rev=10939&r1=10938&r2=10939&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/RepoInfoBase.cc (original) +++ trunk/libzypp/zypp/repo/RepoInfoBase.cc Fri Sep 5 10:03:05 2008 @@ -59,8 +59,6 @@ // /////////////////////////////////////////////////////////////////// - IMPL_PTR_TYPE(RepoInfoBase); - /////////////////////////////////////////////////////////////////// // // METHOD NAME : RepoInfoBase::RepoInfoBase Modified: trunk/libzypp/zypp/repo/RepoInfoBase.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoInfoBase.h?rev=10939&r1=10938&r2=10939&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/RepoInfoBase.h (original) +++ trunk/libzypp/zypp/repo/RepoInfoBase.h Fri Sep 5 10:03:05 2008 @@ -15,7 +15,6 @@ #include <iosfwd> #include "zypp/base/PtrTypes.h" -#include "zypp/base/ReferenceCounted.h" #include "zypp/Pathname.h" @@ -26,8 +25,6 @@ namespace repo { ///////////////////////////////////////////////////////////////// - DEFINE_PTR_TYPE(RepoInfoBase); - /////////////////////////////////////////////////////////////////// // // CLASS NAME : RepoInfoBase @@ -36,7 +33,7 @@ * \short Base class implementing common features of \ref RepoInfo and * \ref ServiceInfo. */ - class RepoInfoBase : public base::ReferenceCounted + class RepoInfoBase { friend std::ostream & operator<<( std::ostream & str, const RepoInfoBase & obj ); @@ -155,6 +152,8 @@ inline bool operator<( const RepoInfoBase & lhs, const RepoInfoBase & rhs ) { return lhs.alias() < rhs.alias(); } + typedef shared_ptr<RepoInfoBase> RepoInfoBase_Ptr; + ///////////////////////////////////////////////////////////////// } // namespace repo -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org