Author: mlandres Date: Fri Sep 12 17:58:22 2008 New Revision: 11054 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11054&view=rev Log: Make MatchServiceAlias a real functor (use operator()) Modified: trunk/libzypp/zypp/RepoManager.h Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=11054&r1=11053&r2=11054&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Fri Sep 12 17:58:22 2008 @@ -15,9 +15,9 @@ #include <iosfwd> #include <list> -#include - #include "zypp/base/PtrTypes.h" +#include "zypp/base/Iterator.h" + #include "zypp/Pathname.h" #include "zypp/ZConfig.h" #include "zypp/RepoInfo.h" @@ -565,11 +565,11 @@ */ struct MatchServiceAlias { - private: - std::string alias; public: MatchServiceAlias( const std::string & alias_ ) : alias(alias_) {} - bool match( const RepoInfo & info ) { return info.service() == alias; } + bool operator()( const RepoInfo & info ) const { return info.service() == alias; } + private: + std::string alias; }; public: @@ -612,12 +612,9 @@ { MatchServiceAlias filter(alias); - std::copy( - boost::make_filter_iterator( - bind(&MatchServiceAlias::match, filter, _1), repoBegin(), repoEnd()), - boost::make_filter_iterator( - bind(&MatchServiceAlias::match, filter, _1), repoEnd(), repoEnd()), - out); + std::copy( boost::make_filter_iterator( filter, repoBegin(), repoEnd() ), + boost::make_filter_iterator( filter, repoEnd(), repoEnd() ), + out); } protected: -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org