Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8b275b5b32953056d441864aee2fe384b7261bd0
commit 8b275b5b32953056d441864aee2fe384b7261bd0 Author: Michel Hermier <herm...@frugalware.org> Date: Thu Nov 6 09:10:18 2014 +0100 lipacman: Simplify iterator_traits (remove iterator typedef). diff --git a/lib/libpacman/util/flist.h b/lib/libpacman/util/flist.h index 035ac66..f5ea6d1 100644 --- a/lib/libpacman/util/flist.h +++ b/lib/libpacman/util/flist.h @@ -37,34 +37,33 @@ namespace flib template <typename Iterator> struct iterator_traits { - typedef Iterator iterator; - typedef typename iterator::difference_type difference_type; - typedef typename iterator::pointer pointer; - typedef typename iterator::reference reference; - typedef typename iterator::size_type size_type; - typedef typename iterator::value_type value_type; + typedef typename Iterator::difference_type difference_type; + typedef typename Iterator::pointer pointer; + typedef typename Iterator::reference reference; + typedef typename Iterator::size_type size_type; + typedef typename Iterator::value_type value_type; - static iterator next(const iterator &i) + static Iterator next(const Iterator &i) { return i.next(); } - static iterator previous(const iterator &i) + static Iterator previous(const Iterator &i) { return i.previous(); } - static reference reference_of(iterator i) + static reference reference_of(Iterator i) { return *i; } - static pointer pointer_of(iterator i) + static pointer pointer_of(Iterator i) { return i.operator -> (); } - static value_type value_of(const iterator i) + static value_type value_of(const Iterator i) { return *i; } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git