Author: mlandres Date: Thu Jun 14 17:37:20 2007 New Revision: 5752 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5752&view=rev Log: fix missing return value, impl ptr type and protection of SafeBool Modified: trunk/libzypp/zypp/Bit.h trunk/libzypp/zypp/Repository.h trunk/libzypp/zypp/RepositoryFactory.cc trunk/libzypp/zypp/Source.h Modified: trunk/libzypp/zypp/Bit.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Bit.h?rev=5752&r1=5751&r2=5752&view=diff ============================================================================== --- trunk/libzypp/zypp/Bit.h (original) +++ trunk/libzypp/zypp/Bit.h Thu Jun 14 17:37:20 2007 @@ -159,7 +159,7 @@ */ template<class _IntT> class BitField : public Range<_IntT, 0, MaxBits<_IntT>::value> - , public base::SafeBool<BitField<_IntT> > /* private, but gcc refuses */ + , private base::SafeBool<BitField<_IntT> > { typedef typename base::SafeBool<BitField<_IntT> >::bool_type bool_type; Modified: trunk/libzypp/zypp/Repository.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Repository.h?rev=5752&r1=5751&r2=5752&view=diff ============================================================================== --- trunk/libzypp/zypp/Repository.h (original) +++ trunk/libzypp/zypp/Repository.h Thu Jun 14 17:37:20 2007 @@ -17,8 +17,8 @@ DEFINE_PTR_TYPE(RepositoryImpl); class RepositoryImpl; } - - class Repository : protected base::SafeBool<Repository> /* private, but gcc refuses */ + + class Repository : private base::SafeBool<Repository> { public: friend std::ostream & operator<<( std::ostream & str, const Repository & obj ); @@ -51,11 +51,11 @@ /** Runtime unique numeric Repository Id. */ NumericId numericId() const; - + const ResStore & resolvables(); - + const RepoInfo info() const; - + private: friend base::SafeBool<Repository>::operator bool_type() const; /** \ref SafeBool test. */ @@ -74,7 +74,7 @@ private: /** Pointer to implementation */ - Impl_Ptr _pimpl; + RW_pointer<Impl,rw_pointer::Intrusive<Impl> > _pimpl; }; } Modified: trunk/libzypp/zypp/RepositoryFactory.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepositoryFactory.cc?rev=5752&r1=5751&r2=5752&view=diff ============================================================================== --- trunk/libzypp/zypp/RepositoryFactory.cc (original) +++ trunk/libzypp/zypp/RepositoryFactory.cc Thu Jun 14 17:37:20 2007 @@ -15,7 +15,7 @@ Repository RepositoryFactory::createFrom( const RepoInfo & context ) { - + return Repository::noRepository; } } // ns zypp Modified: trunk/libzypp/zypp/Source.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Source.h?rev=5752&r1=5751&r2=5752&view=diff ============================================================================== --- trunk/libzypp/zypp/Source.h (original) +++ trunk/libzypp/zypp/Source.h Thu Jun 14 17:37:20 2007 @@ -106,7 +106,7 @@ * \note Source is a reference to the implementation. No COW * is performed. */ - class Source_Ref : protected base::SafeBool<Source_Ref> /* private, but gcc refuses */ + class Source_Ref : private base::SafeBool<Source_Ref> { friend std::ostream & operator<<( std::ostream & str, const Source_Ref & obj ); friend bool operator==( const Source_Ref & lhs, const Source_Ref & rhs ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org