Author: jkupec Date: Thu Apr 10 19:11:38 2008 New Revision: 9517 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9517&view=rev Log: - don't hold const CompiledAttrMap & in PoolQueryIterator Modified: trunk/libzypp/zypp/PoolQuery.cc trunk/libzypp/zypp/PoolQuery.h Modified: trunk/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=9517&r1=9516&r2=9517&view=diff ============================================================================== --- trunk/libzypp/zypp/PoolQuery.cc (original) +++ trunk/libzypp/zypp/PoolQuery.cc Thu Apr 10 19:11:38 2008 @@ -517,11 +517,10 @@ , _pqimpl(pqimpl) , _sid(0) , _has_next(true) - , _attrs(pqimpl->_rcattrs) , _do_matching(false) , _pool((sat::Pool::instance())) { - if (_attrs.size() > 1) + if (_pqimpl->_rcattrs.size() > 1) _do_matching = true; } @@ -611,8 +610,8 @@ if (!matches && in_repo) { SolvAttr attr(_rdit->key->name); - PoolQuery::CompiledAttrMap::const_iterator ai = _attrs.find(attr); - if (ai != _attrs.end()) + PoolQuery::CompiledAttrMap::const_iterator ai = _pqimpl->_rcattrs.find(attr); + if (ai != _pqimpl->_rcattrs.end()) { if ((_pqimpl->_cflags & SEARCH_STRINGMASK) == SEARCH_REGEX) { Modified: trunk/libzypp/zypp/PoolQuery.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.h?rev=9517&r1=9516&r2=9517&view=diff ============================================================================== --- trunk/libzypp/zypp/PoolQuery.h (original) +++ trunk/libzypp/zypp/PoolQuery.h Thu Apr 10 19:11:38 2008 @@ -303,7 +303,7 @@ public: PoolQueryIterator() : PoolQueryIterator::iterator_adaptor_(0), _has_next(true), - _attrs(PoolQuery::CompiledAttrMap()), _do_matching(false), _pool((sat::Pool::instance())) + _do_matching(false), _pool((sat::Pool::instance())) { _rdit = 0; _sid = 0; } private: @@ -339,7 +339,6 @@ const PoolQuery::Impl * _pqimpl; /*SolvableId*/ int _sid; bool _has_next; - const PoolQuery::CompiledAttrMap & _attrs; bool _do_matching; sat::Pool _pool; }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org