Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=fb585c3f4a95333bf573bd892ec33f3f21893eaa
commit fb585c3f4a95333bf573bd892ec33f3f21893eaa Author: Michel Hermier <[email protected]> Date: Tue Sep 30 10:18:06 2014 +0200 libpacman: Define libpacman::package_set and group_set to avoid long declarations in future changes. diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index 4b25545..18abed5 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -33,7 +33,6 @@ #include "kernel/fobject.h" #include "util/fptrlist.h" -#include "util/fset.h" #include "util/fstringlist.h" #include "fstring.h" @@ -88,8 +87,8 @@ public: ::libpacman::Handle *m_handle; char *path; libpacman::Timestamp cache_timestamp; - flib::set<libpacman::Package *, libpacman::less<const libpacman::Package *>> pkgcache; - flib::set<libpacman::Group *, libpacman::less<const libpacman::Group *>> grpcache; + libpacman::package_set pkgcache; + libpacman::group_set grpcache; FPtrList servers; protected: diff --git a/lib/libpacman/group.h b/lib/libpacman/group.h index f917a3b..94e1d80 100644 --- a/lib/libpacman/group.h +++ b/lib/libpacman/group.h @@ -24,6 +24,7 @@ #include "pacman.h" #include "kernel/fobject.h" +#include "util/fset.h" #include "util/fstringlist.h" #define GRP_NAME_LEN 256 @@ -51,6 +52,7 @@ public: bool operator () (const Group *pkg1, const Group *pkg2); }; + typedef flib::set<libpacman::Group *, libpacman::less<const libpacman::Group *>> group_set; } int _pacman_grp_cmp(const void *g1, const void *g2); diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 387be8f..29e492f 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -33,6 +33,7 @@ #include "kernel/fobject.h" #include "kernel/fstr.h" +#include "util/fset.h" typedef struct __pmdepend_t pmdepend_t; @@ -181,6 +182,8 @@ public: bool operator () (const Package *pkg1, const Package *pkg2); }; + typedef flib::set<libpacman::Package *, libpacman::less<const libpacman::Package *>> package_set; + class PackageMatcher : FMatcher<const libpacman::Package *> { diff --git a/lib/libpacman/util/flist.h b/lib/libpacman/util/flist.h index fb55c7f..3741f46 100644 --- a/lib/libpacman/util/flist.h +++ b/lib/libpacman/util/flist.h @@ -24,7 +24,6 @@ #include "pacman.h" -#include "util/fptrlist.h" #include "util.h" /* Sort comparison callback function declaration */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
