Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=efacc1af089e42d32a1f1a2e43d1c43e3d6f28ab
commit efacc1af089e42d32a1f1a2e43d1c43e3d6f28ab
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Nov 10 09:47:46 2014 +0100
libpacman: Fix some typo/missing conversions of keyed_value in flib::set.
diff --git a/lib/libpacman/util/fset.h b/lib/libpacman/util/fset.h
index 3ee53e9..af4e89c 100644
--- a/lib/libpacman/util/fset.h
+++ b/lib/libpacman/util/fset.h
@@ -99,10 +99,11 @@ namespace flib
{
iterator end = this->end();
/* Find insertion point. */
- iterator next =
find_insertion_point(keyed_value_traits::value_of(keyed_value));
+ iterator next =
find_insertion_point(keyed_value_traits::key_of(keyed_value));
// ensure we don't have an egality
- if(next == end || m_compare(keyed_value, *next)) {
+ if(next == end
+ ||
m_compare(keyed_value_traits::key_of(keyed_value),
keyed_value_traits::key_of(*next))) {
typename super_type::data_holder add = new FListItem<T>(keyed_value);
add->insert_after(next.previous());
return iterator(add);
@@ -151,7 +152,7 @@ namespace flib
{
return super_type::find_if_not(
[&] (const keyed_value_type &keyed_value) -> bool
- { return
m_compare(keyed_value_traits::value_of(keyed_value), key); });
+ { return
m_compare(keyed_value_traits::key_of(keyed_value), key); });
}
Compare m_compare;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
