Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2012-05-08 06:46:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2012-05-03 10:58:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2012-05-08 06:46:50.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 4 11:18:17 CEST 2012 - [email protected] + +- build with gcc-4.7 (bnc#755324) +- version 11.5.0 (5) + +------------------------------------------------------------------- Old: ---- libzypp-11.4.0.tar.bz2 New: ---- libzypp-11.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.KwLTVR/_old 2012-05-08 06:46:54.000000000 +0200 +++ /var/tmp/diff_new_pack.KwLTVR/_new 2012-05-08 06:46:54.000000000 +0200 @@ -16,7 +16,7 @@ # # norootforbuild -%define force_gcc_46 1 +%define force_gcc_46 0 Name: libzypp @@ -24,7 +24,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 11.4.0 +Version: 11.5.0 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-11.4.0.tar.bz2 -> libzypp-11.5.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/VERSION.cmake new/libzypp-11.5.0/VERSION.cmake --- old/libzypp-11.4.0/VERSION.cmake 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/VERSION.cmake 2012-05-04 11:39:04.000000000 +0200 @@ -59,10 +59,10 @@ # See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "11") -SET(LIBZYPP_COMPATMINOR "4") -SET(LIBZYPP_MINOR "4") +SET(LIBZYPP_COMPATMINOR "5") +SET(LIBZYPP_MINOR "5") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 11.4.0 (4) +# LAST RELEASED: 11.5.0 (5) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/libzypp.spec.cmake new/libzypp-11.5.0/libzypp.spec.cmake --- old/libzypp-11.4.0/libzypp.spec.cmake 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/libzypp.spec.cmake 2012-05-04 11:39:04.000000000 +0200 @@ -16,7 +16,7 @@ # # norootforbuild -%define force_gcc_46 1 +%define force_gcc_46 0 Name: @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/package/libzypp.changes new/libzypp-11.5.0/package/libzypp.changes --- old/libzypp-11.4.0/package/libzypp.changes 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/package/libzypp.changes 2012-05-04 11:39:04.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 4 11:18:17 CEST 2012 - [email protected] + +- build with gcc-4.7 (bnc#755324) +- version 11.5.0 (5) + +------------------------------------------------------------------- Wed Apr 25 18:50:20 CEST 2012 - [email protected] - Fix lost device info when mounting CD/DVD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/Digest.h new/libzypp-11.5.0/zypp/Digest.h --- old/libzypp-11.4.0/zypp/Digest.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/Digest.h 2012-05-04 11:39:04.000000000 +0200 @@ -19,8 +19,8 @@ #include <iosfwd> #include <vector> -#include <zypp/Callback.h> -#include <zypp/Pathname.h> +#include "zypp/Callback.h" +#include "zypp/Pathname.h" namespace zypp { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/DiskUsageCounter.h new/libzypp-11.5.0/zypp/DiskUsageCounter.h --- old/libzypp-11.4.0/zypp/DiskUsageCounter.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/DiskUsageCounter.h 2012-05-04 11:39:04.000000000 +0200 @@ -12,7 +12,7 @@ #ifndef ZYPP_DISKUSAGE_COUNTER_H #define ZYPP_DISKUSAGE_COUNTER_H -#include <zypp/ResPool.h> +#include "zypp/ResPool.h" #include <set> #include <string> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/ExternalProgram.h new/libzypp-11.5.0/zypp/ExternalProgram.h --- old/libzypp-11.4.0/zypp/ExternalProgram.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/ExternalProgram.h 2012-05-04 11:39:04.000000000 +0200 @@ -13,6 +13,8 @@ #ifndef ZYPP_EXTERNALPROGRAM_H #define ZYPP_EXTERNALPROGRAM_H +#include <unistd.h> + #include <map> #include <string> #include <vector> @@ -260,7 +262,7 @@ public: /** Return \c FILE* to read programms stderr (O_NONBLOCK set). */ - _ExternalProgram::EarlyPipe::stderr; + using _ExternalProgram::EarlyPipe::stderr; /** Read data up to \c delim_r from stderr (nonblocking). * \note If \c delim_r is '\0', we read as much data as possible. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/MediaSetAccess.h new/libzypp-11.5.0/zypp/MediaSetAccess.h --- old/libzypp-11.4.0/zypp/MediaSetAccess.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/MediaSetAccess.h 2012-05-04 11:39:04.000000000 +0200 @@ -13,7 +13,7 @@ #include <iosfwd> #include <string> #include <vector> -#include <zypp/base/Function.h> +#include "zypp/base/Function.h" #include "zypp/base/ReferenceCounted.h" #include "zypp/base/NonCopyable.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/ResTraits.h new/libzypp-11.5.0/zypp/ResTraits.h --- old/libzypp-11.4.0/zypp/ResTraits.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/ResTraits.h 2012-05-04 11:39:04.000000000 +0200 @@ -38,7 +38,7 @@ * Forward declaration of all Resolvable smart pointer * types provided in \c ResTraits.h (recommended in header files): * \code - * #include<zypp/ResTraits.h> + * #include "zypp/ResTraits.h" * * Resolvable_Ptr // Resolvable * * ResTraits<Resolvable>::PtrType // same as above @@ -49,7 +49,7 @@ * * Synonym, but requires \c Resolvable.h being included: * \code - * #include<zypp/Resolvable.h> + * #include "zypp/Resolvable.h" * * Resolvable::Ptr // same as Resolvable_Ptr but requires Resolvable.h * Resolvable::constPtr // same as Resolvable_constPtr but requires Resolvable.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/Resolvable.h new/libzypp-11.5.0/zypp/Resolvable.h --- old/libzypp-11.4.0/zypp/Resolvable.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/Resolvable.h 2012-05-04 11:39:04.000000000 +0200 @@ -36,7 +36,7 @@ /** Interface base for resolvable objects (identification and dependencies). * \todo Merge with ResObject */ - class Resolvable : protected sat::Solvable, + class Resolvable : protected zypp::sat::Solvable, // Note: gcc bug #52841 prohibits using just sat::Solvable public base::ReferenceCounted, private base::NonCopyable { friend std::ostream & operator<<( std::ostream & str, const Resolvable & obj ); @@ -51,7 +51,7 @@ public: #ifndef SWIG // Swig treats it as syntax error /** Whether this represents a valid- or no-solvable. */ - using sat::Solvable::operator bool_type; + using zypp::sat::Solvable::operator bool_type; // Note: gcc bug #52841 prohibits using just sat::Solvable #endif /** Whether this represents an installed solvable. */ bool isSystem() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/Url.cc new/libzypp-11.5.0/zypp/Url.cc --- old/libzypp-11.4.0/zypp/Url.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/Url.cc 2012-05-04 11:39:04.000000000 +0200 @@ -10,11 +10,11 @@ * \file zypp/Url.cc */ -#include <zypp/Url.h> -#include <zypp/Pathname.h> -#include <zypp/base/Gettext.h> -#include <zypp/base/String.h> -#include <zypp/base/Regex.h> +#include "zypp/Url.h" +#include "zypp/Pathname.h" +#include "zypp/base/Gettext.h" +#include "zypp/base/String.h" +#include "zypp/base/Regex.h" #include <stdexcept> #include <iostream> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/Url.h new/libzypp-11.5.0/zypp/Url.h --- old/libzypp-11.4.0/zypp/Url.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/Url.h 2012-05-04 11:39:04.000000000 +0200 @@ -12,8 +12,8 @@ #ifndef ZYPP_URL_H #define ZYPP_URL_H -#include <zypp/url/UrlBase.h> -#include <zypp/url/UrlUtils.h> +#include "zypp/url/UrlBase.h" +#include "zypp/url/UrlUtils.h" ////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/ZConfig.cc new/libzypp-11.5.0/zypp/ZConfig.cc --- old/libzypp-11.4.0/zypp/ZConfig.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/ZConfig.cc 2012-05-04 11:39:04.000000000 +0200 @@ -573,14 +573,14 @@ multiversionDir = ( cfg_config_path.empty() ? Pathname("/etc/zypp") : cfg_config_path ) / "multiversion.d"; filesystem::dirForEach( multiversionDir, - [&_multiversion]( const Pathname & dir_r, const char *const & name_r )->bool + [this]( const Pathname & dir_r, const char *const & name_r )->bool { MIL << "Parsing " << dir_r/name_r << endl; iostr::simpleParseFile( InputStream( dir_r/name_r ), - [&_multiversion]( int num_r, std::string line_r )->bool + [this]( int num_r, std::string line_r )->bool { DBG << " found " << line_r << endl; - _multiversion.insert( line_r ); + _multiversion.insert( line_r ); return true; } ); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/base/Errno.h new/libzypp-11.5.0/zypp/base/Errno.h --- old/libzypp-11.4.0/zypp/base/Errno.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/base/Errno.h 2012-05-04 11:39:04.000000000 +0200 @@ -15,7 +15,7 @@ #include <cerrno> #include <iosfwd> -#include <zypp/base/String.h> +#include "zypp/base/String.h" /////////////////////////////////////////////////////////////////// namespace zypp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/base/GzStream.cc new/libzypp-11.5.0/zypp/base/GzStream.cc --- old/libzypp-11.4.0/zypp/base/GzStream.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/base/GzStream.cc 2012-05-04 11:39:04.000000000 +0200 @@ -21,8 +21,8 @@ #include <cerrno> #include <iostream> -#include <zypp/base/LogControl.h> -#include <zypp/base/LogTools.h> +#include "zypp/base/LogControl.h" +#include "zypp/base/LogTools.h" using std::endl; #include "zypp/base/GzStream.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/base/PtrTypes.h new/libzypp-11.5.0/zypp/base/PtrTypes.h --- old/libzypp-11.4.0/zypp/base/PtrTypes.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/base/PtrTypes.h 2012-05-04 11:39:04.000000000 +0200 @@ -390,6 +390,15 @@ /////////////////////////////////////////////////////////////////// + /** \relates RWCOW_pointer Clone the underlying object. + * Calls \a rhs <tt>-\>clone()</tt>. Being defined as a + * function outside \ref RWCOW_pointer allows to overload + * it, in case a specific \a _D does not have <tt>clone()</tt>. + */ + template<class _D> + inline _D * rwcowClone( const _D * rhs ) + { return rhs->clone(); } + /////////////////////////////////////////////////////////////////// // // CLASS NAME : RWCOW_pointer @@ -480,17 +489,6 @@ }; /////////////////////////////////////////////////////////////////// - /** \relates RWCOW_pointer Clone the underlying object. - * Calls \a rhs <tt>-\>clone()</tt>. Being defined as a - * function outside \ref RWCOW_pointer allows to overload - * it, in case a specific \a _D does not have <tt>clone()</tt>. - */ - template<class _D> - inline _D * rwcowClone( const _D * rhs ) - { return rhs->clone(); } - - /////////////////////////////////////////////////////////////////// - /** \relates RWCOW_pointer Stream output. * * Print the \c _D object the RWCOW_pointer refers, or \c "NULL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/base/Random.cc new/libzypp-11.5.0/zypp/base/Random.cc --- old/libzypp-11.4.0/zypp/base/Random.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/base/Random.cc 2012-05-04 11:39:04.000000000 +0200 @@ -1,8 +1,5 @@ - -#include <cstdlib> -#include <cstdio> -#include <iostream> #include <fcntl.h> +#include <unistd.h> #include "zypp/base/Random.h" using namespace std; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/base/SafeBool.h new/libzypp-11.5.0/zypp/base/SafeBool.h --- old/libzypp-11.4.0/zypp/base/SafeBool.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/base/SafeBool.h 2012-05-04 11:39:04.000000000 +0200 @@ -69,7 +69,7 @@ template<class _Derived> struct SafeBool : private safebool_detail::SafeBoolBase { - typedef safebool_detail::SafeBoolBase::bool_type bool_type; + using safebool_detail::SafeBoolBase::bool_type; operator bool_type() const { return( (static_cast<const _Derived *>(this))->boolTest() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/base/Tr1hash.h new/libzypp-11.5.0/zypp/base/Tr1hash.h --- old/libzypp-11.4.0/zypp/base/Tr1hash.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/base/Tr1hash.h 2012-05-04 11:39:04.000000000 +0200 @@ -16,8 +16,6 @@ #include <tr1/unordered_set> #include <tr1/unordered_map> -#include "zypp/base/PtrTypes.h" - /** Define hash function for id based classes. * Class has to provide a method \c id() retuning a unique number. * \code @@ -36,20 +34,26 @@ }} /////////////////////////////////////////////////////////////////// -namespace zypp +namespace std { ///////////////////////////////////////////////////////////////// - - /** clone function for RW_pointer */ - template<class _D> - inline std::tr1::unordered_set<_D> * rwcowClone( const std::tr1::unordered_set<_D> * rhs ) - { return new std::tr1::unordered_set<_D>( *rhs ); } - - /** clone function for RW_pointer */ - template<class _K, class _V> - inline std::tr1::unordered_map<_K,_V> * rwcowClone( const std::tr1::unordered_map<_K,_V> * rhs ) - { return new std::tr1::unordered_map<_K,_V>( *rhs ); } - + /////////////////////////////////////////////////////////////////// + namespace tr1 + { ///////////////////////////////////////////////////////////////// + + /** clone function for RW_pointer */ + template<class _D> + inline unordered_set<_D> * rwcowClone( const std::tr1::unordered_set<_D> * rhs ) + { return new std::tr1::unordered_set<_D>( *rhs ); } + + /** clone function for RW_pointer */ + template<class _K, class _V> + inline std::tr1::unordered_map<_K,_V> * rwcowClone( const std::tr1::unordered_map<_K,_V> * rhs ) + { return new std::tr1::unordered_map<_K,_V>( *rhs ); } + + ///////////////////////////////////////////////////////////////// + } // namespace tr1 + /////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////// -} // namespace zypp +} // namespace std /////////////////////////////////////////////////////////////////// #endif // ZYPP_BASE_TR1HASH_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/media/MediaManager.h new/libzypp-11.5.0/zypp/media/MediaManager.h --- old/libzypp-11.4.0/zypp/media/MediaManager.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/media/MediaManager.h 2012-05-04 11:39:04.000000000 +0200 @@ -12,13 +12,13 @@ #ifndef ZYPP_MEDIA_MEDIAMANAGER_H #define ZYPP_MEDIA_MEDIAMANAGER_H -#include <zypp/media/MediaAccess.h> +#include "zypp/media/MediaAccess.h" -#include <zypp/base/Deprecated.h> -#include <zypp/base/NonCopyable.h> -#include <zypp/base/PtrTypes.h> -#include <zypp/Pathname.h> -#include <zypp/Url.h> +#include "zypp/base/Deprecated.h" +#include "zypp/base/NonCopyable.h" +#include "zypp/base/PtrTypes.h" +#include "zypp/Pathname.h" +#include "zypp/Url.h" #include <list> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/media/proxyinfo/ProxyInfoLibproxy.cc new/libzypp-11.5.0/zypp/media/proxyinfo/ProxyInfoLibproxy.cc --- old/libzypp-11.4.0/zypp/media/proxyinfo/ProxyInfoLibproxy.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/media/proxyinfo/ProxyInfoLibproxy.cc 2012-05-04 11:39:04.000000000 +0200 @@ -67,7 +67,7 @@ if ( proxyFactory ) ::px_proxy_factory_free( proxyFactory ); - TmpUnsetEnv env[] = { "KDE_FULL_SESSION", "GNOME_DESKTOP_SESSION_ID", "DESKTOP_SESSION" }; + TmpUnsetEnv envguard[] __attribute__ ((__unused__)) = { "KDE_FULL_SESSION", "GNOME_DESKTOP_SESSION_ID", "DESKTOP_SESSION" }; proxyFactory = ::px_proxy_factory_new(); } else if ( ! proxyFactory ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/parser/xml/XmlEscape.h new/libzypp-11.5.0/zypp/parser/xml/XmlEscape.h --- old/libzypp-11.4.0/zypp/parser/xml/XmlEscape.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/parser/xml/XmlEscape.h 2012-05-04 11:39:04.000000000 +0200 @@ -13,7 +13,7 @@ #define ZYPP_PARSER_XML_XMLESCAPE_H // from IoBind Library: -#include <zypp/parser/xml/xml_escape_parser.hpp> +#include "zypp/parser/xml/xml_escape_parser.hpp" /////////////////////////////////////////////////////////////////// namespace zypp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/parser/xml_escape_parser.hpp new/libzypp-11.5.0/zypp/parser/xml_escape_parser.hpp --- old/libzypp-11.4.0/zypp/parser/xml_escape_parser.hpp 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/parser/xml_escape_parser.hpp 2012-05-04 11:39:04.000000000 +0200 @@ -3,4 +3,4 @@ #warning ....................Consider using zypp::xml::escape instead of #warning ....................iobind::parser::xml_escape_parser to become #warning ....................implementation independent. -#include <zypp/parser/xml/XmlEscape.h> +#include "zypp/parser/xml/XmlEscape.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/pool/PoolTraits.h new/libzypp-11.5.0/zypp/pool/PoolTraits.h --- old/libzypp-11.4.0/zypp/pool/PoolTraits.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/pool/PoolTraits.h 2012-05-04 11:39:04.000000000 +0200 @@ -43,6 +43,20 @@ { return pi; } }; + /** In CXX0X std::_Select2nd does no longer derive from std::unary_function + */ + template<typename _Pair> + struct P_Select2nd : public std::unary_function<_Pair, typename _Pair::second_type> + { + typename _Pair::second_type& + operator()(_Pair& __x) const + { return __x.second; } + + const typename _Pair::second_type& + operator()(const _Pair& __x) const + { return __x.second; } + }; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : PoolTraits @@ -63,7 +77,7 @@ /** ident index */ typedef std::tr1::unordered_multimap<sat::detail::IdType, PoolItem> Id2ItemT; - typedef std::_Select2nd<Id2ItemT::value_type> Id2ItemValueSelector; + typedef P_Select2nd<Id2ItemT::value_type> Id2ItemValueSelector; typedef transform_iterator<Id2ItemValueSelector, Id2ItemT::const_iterator> byIdent_iterator; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/repo/RepoVariables.cc new/libzypp-11.5.0/zypp/repo/RepoVariables.cc --- old/libzypp-11.4.0/zypp/repo/RepoVariables.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/repo/RepoVariables.cc 2012-05-04 11:39:04.000000000 +0200 @@ -73,9 +73,10 @@ static ReplacerData _data; std::string ret( value_r ); - ret = str::replaceAllFun( ret, "$arch", [&_data]()-> std::string { return _data.sysarch(); } ); - ret = str::replaceAllFun( ret, "$basearch", [&_data]()-> std::string { return _data.basearch(); } ); - ret = str::replaceAllFun( ret, "$releasever", [&_data]()-> std::string { return _data.releasever(); } ); + // Don't need to capture static (non automatic) _data in lambda + ret = str::replaceAllFun( ret, "$arch", []()-> std::string { return _data.sysarch(); } ); + ret = str::replaceAllFun( ret, "$basearch", []()-> std::string { return _data.basearch(); } ); + ret = str::replaceAllFun( ret, "$releasever", []()-> std::string { return _data.releasever(); } ); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/sat/Map.cc new/libzypp-11.5.0/zypp/sat/Map.cc --- old/libzypp-11.4.0/zypp/sat/Map.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/sat/Map.cc 2012-05-04 11:39:04.000000000 +0200 @@ -69,7 +69,7 @@ ::memset( _pimpl->map, (val_r?-1:0), _pimpl->size ); } -#define M_RANGE_CKECK(IDX,LOC) if ( ((IDX) >> 3) >= _pimpl->size ) throw std::out_of_range( "zypp::sat::Map::" LOC ) +#define M_RANGE_CKECK(IDX,LOC) if ( ((IDX) >> 3) >= size_type(_pimpl->size) ) throw std::out_of_range( "zypp::sat::Map::" LOC ) void Map::set( size_type idx_r ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/solver/detail/InstallOrder.cc new/libzypp-11.5.0/zypp/solver/detail/InstallOrder.cc --- old/libzypp-11.4.0/zypp/solver/detail/InstallOrder.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/solver/detail/InstallOrder.cc 2012-05-04 11:39:04.000000000 +0200 @@ -37,7 +37,7 @@ #include "zypp/ResFilters.h" #include "zypp/ResStatus.h" #include "zypp/sat/Pool.h" -#include <zypp/sat/WhatObsoletes.h> +#include "zypp/sat/WhatObsoletes.h" ///////////////////////////////////////////////////////////////////////// namespace zypp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/target/hal/HalContext.cc new/libzypp-11.5.0/zypp/target/hal/HalContext.cc --- old/libzypp-11.4.0/zypp/target/hal/HalContext.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/target/hal/HalContext.cc 2012-05-04 11:39:04.000000000 +0200 @@ -10,7 +10,7 @@ * * \brief Hardware abstaction layer library wrapper implementation. */ -#include <zypp/target/hal/HalException.h> +#include "zypp/target/hal/HalException.h" ////////////////////////////////////////////////////////////////////// namespace zypp { //////////////////////////////////////////////////////////////////// @@ -35,13 +35,13 @@ #ifndef NO_HAL // disables zypp's HAL dependency -#include <zypp/target/hal/HalContext.h> -#include <zypp/thread/Mutex.h> -#include <zypp/thread/MutexLock.h> -#include <zypp/base/NonCopyable.h> -#include <zypp/base/Logger.h> -#include <zypp/base/String.h> -#include <zypp/base/Gettext.h> +#include "zypp/target/hal/HalContext.h" +#include "zypp/thread/Mutex.h" +#include "zypp/thread/MutexLock.h" +#include "zypp/base/NonCopyable.h" +#include "zypp/base/Logger.h" +#include "zypp/base/String.h" +#include "zypp/base/Gettext.h" #include <hal/libhal.h> #include <hal/libhal-storage.h> @@ -1100,8 +1100,8 @@ } // namespace zypp ////////////////////////////////////////////////////////////////////// #else // NO_HAL -#include <zypp/target/hal/HalContext.h> -#include <zypp/target/hal/HalException.h> +#include "zypp/target/hal/HalContext.h" +#include "zypp/target/hal/HalException.h" namespace zypp { //////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/target/hal/HalContext.h new/libzypp-11.5.0/zypp/target/hal/HalContext.h --- old/libzypp-11.4.0/zypp/target/hal/HalContext.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/target/hal/HalContext.h 2012-05-04 11:39:04.000000000 +0200 @@ -13,8 +13,8 @@ #ifndef ZYPP_TARGET_HAL_HALCONTEXT_H #define ZYPP_TARGET_HAL_HALCONTEXT_H -#include <zypp/target/hal/HalException.h> -#include <zypp/base/PtrTypes.h> +#include "zypp/target/hal/HalException.h" +#include "zypp/base/PtrTypes.h" #include <string> #include <vector> #include <stdint.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/target/hal/HalException.h new/libzypp-11.5.0/zypp/target/hal/HalException.h --- old/libzypp-11.4.0/zypp/target/hal/HalException.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/target/hal/HalException.h 2012-05-04 11:39:04.000000000 +0200 @@ -13,9 +13,9 @@ #ifndef ZYPP_TARGET_HAL_HALEXCEPTION_H #define ZYPP_TARGET_HAL_HALEXCEPTION_H -#include <zypp/base/Exception.h> -#include <zypp/base/Gettext.h> -#include <zypp/base/String.h> +#include "zypp/base/Exception.h" +#include "zypp/base/Gettext.h" +#include "zypp/base/String.h" ////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/thread/Mutex.cc new/libzypp-11.5.0/zypp/thread/Mutex.cc --- old/libzypp-11.4.0/zypp/thread/Mutex.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/thread/Mutex.cc 2012-05-04 11:39:04.000000000 +0200 @@ -8,9 +8,9 @@ \---------------------------------------------------------------------*/ /** \file zypp/thread/Mutex.cc */ -#include <zypp/thread/Mutex.h> -#include <zypp/thread/MutexException.h> -#include <zypp/base/Gettext.h> +#include "zypp/thread/Mutex.h" +#include "zypp/thread/MutexException.h" +#include "zypp/base/Gettext.h" ////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/thread/Mutex.h new/libzypp-11.5.0/zypp/thread/Mutex.h --- old/libzypp-11.4.0/zypp/thread/Mutex.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/thread/Mutex.h 2012-05-04 11:39:04.000000000 +0200 @@ -11,8 +11,8 @@ #ifndef ZYPP_THREAD_MUTEX_H #define ZYPP_THREAD_MUTEX_H -#include <zypp/base/NonCopyable.h> -#include <zypp/thread/MutexException.h> +#include "zypp/base/NonCopyable.h" +#include "zypp/thread/MutexException.h" #include <pthread.h> ////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/thread/MutexException.h new/libzypp-11.5.0/zypp/thread/MutexException.h --- old/libzypp-11.4.0/zypp/thread/MutexException.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/thread/MutexException.h 2012-05-04 11:39:04.000000000 +0200 @@ -12,7 +12,7 @@ #ifndef ZYPP_THREAD_MUTEXEXCEPTION_H #define ZYPP_THREAD_MUTEXEXCEPTION_H -#include <zypp/base/Exception.h> +#include "zypp/base/Exception.h" ////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/thread/MutexLock.h new/libzypp-11.5.0/zypp/thread/MutexLock.h --- old/libzypp-11.4.0/zypp/thread/MutexLock.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/thread/MutexLock.h 2012-05-04 11:39:04.000000000 +0200 @@ -12,7 +12,7 @@ #ifndef ZYPP_THREAD_MUTEXLOCK_H #define ZYPP_THREAD_MUTEXLOCK_H -#include <zypp/thread/Mutex.h> +#include "zypp/thread/Mutex.h" #include <cassert> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/url/UrlBase.cc new/libzypp-11.5.0/zypp/url/UrlBase.cc --- old/libzypp-11.4.0/zypp/url/UrlBase.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/url/UrlBase.cc 2012-05-04 11:39:04.000000000 +0200 @@ -9,10 +9,10 @@ /** * \file zypp/url/UrlBase.cc */ -#include <zypp/url/UrlBase.h> -#include <zypp/base/String.h> -#include <zypp/base/Gettext.h> -#include <zypp/base/Regex.h> +#include "zypp/url/UrlBase.h" +#include "zypp/base/String.h" +#include "zypp/base/Gettext.h" +#include "zypp/base/Regex.h" #include <stdexcept> #include <climits> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/url/UrlBase.h new/libzypp-11.5.0/zypp/url/UrlBase.h --- old/libzypp-11.4.0/zypp/url/UrlBase.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/url/UrlBase.h 2012-05-04 11:39:04.000000000 +0200 @@ -12,8 +12,8 @@ #ifndef ZYPP_URL_URLBASE_H #define ZYPP_URL_URLBASE_H -#include <zypp/url/UrlUtils.h> -#include <zypp/base/PtrTypes.h> +#include "zypp/url/UrlUtils.h" +#include "zypp/base/PtrTypes.h" ////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/url/UrlException.h new/libzypp-11.5.0/zypp/url/UrlException.h --- old/libzypp-11.4.0/zypp/url/UrlException.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/url/UrlException.h 2012-05-04 11:39:04.000000000 +0200 @@ -12,7 +12,7 @@ #ifndef ZYPP_URL_URLEXCEPTION_H #define ZYPP_URL_URLEXCEPTION_H -#include <zypp/base/Exception.h> +#include "zypp/base/Exception.h" ////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/url/UrlUtils.cc new/libzypp-11.5.0/zypp/url/UrlUtils.cc --- old/libzypp-11.4.0/zypp/url/UrlUtils.cc 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/url/UrlUtils.cc 2012-05-04 11:39:04.000000000 +0200 @@ -9,9 +9,9 @@ /** * \file zypp/url/UrlUtils.cc */ -#include <zypp/base/Gettext.h> -#include <zypp/base/String.h> -#include <zypp/url/UrlUtils.h> +#include "zypp/base/Gettext.h" +#include "zypp/base/String.h" +#include "zypp/url/UrlUtils.h" #include <stdlib.h> // strtol #include <cctype> // isxdigit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.4.0/zypp/url/UrlUtils.h new/libzypp-11.5.0/zypp/url/UrlUtils.h --- old/libzypp-11.4.0/zypp/url/UrlUtils.h 2012-04-26 10:36:57.000000000 +0200 +++ new/libzypp-11.5.0/zypp/url/UrlUtils.h 2012-05-04 11:39:04.000000000 +0200 @@ -12,7 +12,7 @@ #ifndef ZYPP_URL_URLUTILS_H #define ZYPP_URL_URLUTILS_H -#include <zypp/url/UrlException.h> +#include "zypp/url/UrlException.h" #include <string> #include <vector> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
