Author: mvidner Date: Thu Oct 4 14:23:24 2007 New Revision: 7438 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7438&view=rev Log: Renamed templates back because proper qualification makes it work too. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Bit.h trunk/libzypp/zypp/Edition.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7438&r1=7437&r2=7438&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Oct 4 14:23:24 2007 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "4") -SET(LIBZYPP_MINOR "0") -SET(LIBZYPP_COMPATMINOR "0") +SET(LIBZYPP_MINOR "1") +SET(LIBZYPP_COMPATMINOR "1") SET(LIBZYPP_PATCH "0") Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=7438&r1=7437&r2=7438&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Oct 4 14:23:24 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 4 14:22:31 CEST 2007 - mvidner@suse.cz + +- Renamed templates back because proper qualification makes it work + too. +- 4.1.0 + +------------------------------------------------------------------- Thu Oct 04 11:23:19 CEST 2007 - aschnell@suse.de - only look for repositories in file ending ".repo" (bug #294779) Modified: trunk/libzypp/zypp/Bit.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Bit.h?rev=7438&r1=7437&r2=7438&view=diff ============================================================================== --- trunk/libzypp/zypp/Bit.h (original) +++ trunk/libzypp/zypp/Bit.h Thu Oct 4 14:23:24 2007 @@ -48,7 +48,7 @@ /** Number of bits available in \a _IntT. */ template<class _IntT> - struct MaxBitsT + struct MaxBits { typedef _IntT IntT; static const unsigned value = (sizeof(IntT)*8); @@ -58,8 +58,8 @@ template<class _IntT> inline std::string asString( _IntT val, char zero = '0', char one = '1' ) { - std::string s( MaxBitsT<_IntT>::value, zero ); - for( unsigned i = MaxBitsT<_IntT>::value; i; ) + std::string s( MaxBits<_IntT>::value, zero ); + for( unsigned i = MaxBits<_IntT>::value; i; ) { --i; if ( val & (_IntT)1 ) @@ -71,7 +71,7 @@ /** A bitmaks of \a _size 1-bits starting at bit \a _begin. */ template - struct MaskT + struct Mask { typedef _IntT IntT; static const IntT value = bit_detail::Gen1Bits::value << _begin; @@ -83,8 +83,8 @@ struct Range { typedef _IntT IntT; - typedef MaxBitsT<IntT> MaxBits; - typedef MaskT Mask; + typedef zypp::bit::MaxBits<IntT> MaxBits; + typedef zypp::bit::Mask Mask; static const unsigned begin = _begin; static const unsigned size = _size; @@ -158,7 +158,7 @@ * \endcode */ template<class _IntT> - class BitField : public Range<_IntT, 0, MaxBitsT<_IntT>::value> + class BitField : public Range<_IntT, 0, MaxBits<_IntT>::value> , private base::SafeBool > { typedef typename base::SafeBool >::bool_type bool_type; Modified: trunk/libzypp/zypp/Edition.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Edition.h?rev=7438&r1=7437&r2=7438&view=diff ============================================================================== --- trunk/libzypp/zypp/Edition.h (original) +++ trunk/libzypp/zypp/Edition.h Thu Oct 4 14:23:24 2007 @@ -137,7 +137,7 @@ /** \ref compare functor. * \see \ref RelCompare. */ - typedef Compare<Edition> CompareEd; + typedef zypp::Compare<Edition> Compare; /** \ref Edition \ref Range based on \ref Compare. * \see \ref RelCompare. -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org