Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=207678c671271ca34fb3380e58d6c2a4e5cf1dfd
commit 207678c671271ca34fb3380e58d6c2a4e5cf1dfd Author: Michel Hermier <[email protected]> Date: Tue Sep 9 08:01:51 2014 +0200 libpacman: Drop FPtrListItem and use plain FListItem<void *> instead. diff --git a/lib/libpacman/util/flist.h b/lib/libpacman/util/flist.h index 590121b..5dcdc99 100644 --- a/lib/libpacman/util/flist.h +++ b/lib/libpacman/util/flist.h @@ -502,6 +502,16 @@ public: } #endif + FListItem *next() const + { + return static_cast<FListItem *>(m_next); + } + + FListItem *previous() const + { + return static_cast<FListItem *>(m_previous); + } + //protected: T m_data; diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 299336a..4f228be 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -31,10 +31,11 @@ #ifndef __cplusplus typedef struct FPtrList FPtrList; -typedef struct FPtrListItem FPtrListIterator; +typedef struct FPtrListIterator FPtrListIterator; #else /* __cplusplus */ typedef class FPtrList FPtrList; -typedef class FPtrListItem FPtrListIterator; +typedef class FListItem<void *> FPtrListItem; +typedef FPtrListItem FPtrListIterator; extern "C" { #endif /* __cplusplus */ @@ -74,25 +75,6 @@ const FPtrListIterator *f_ptrlist_rend_const(const FPtrList *self); #ifdef __cplusplus } -class FPtrListItem - : public FListItem<void *> -{ -public: - FPtrListItem(void *data = nullptr) - : FListItem<void *>(data) - { } - - FPtrListItem *next() const - { - return (FPtrListItem *)flib::iterable_traits<FCListItem *>::next(this); - } - - FPtrListItem *previous() const - { - return (FPtrListItem *)flib::iterable_traits<FCListItem *>::previous(this); - } -}; - class FPtrList : protected FCListItem { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
