Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7a01e8db54afcd3c49b6476b33d720c448154f3f
commit 7a01e8db54afcd3c49b6476b33d720c448154f3f Author: Michel Hermier <herm...@frugalware.org> Date: Tue Oct 21 15:23:55 2014 +0200 libpacman: Simplify type declarations in package.h diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index c8d81ef..a8222c2 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -93,6 +93,7 @@ bool package::set_filename(const char *filename, int witharch) /* Helper function for comparing packages */ +static int _pacman_pkg_cmp(const package_ptr p1, const package_ptr p2) { package *pkg1 = (package *)p1; diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 6524fd8..4846d12 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -178,16 +178,13 @@ public: }; typedef flib::refcounted_ptr<package> package_ptr; - template <class T> struct less; - template <> struct less<const package_ptr> { bool operator () (const package_ptr pkg1, const package_ptr pkg2); }; - typedef FList<package_ptr> package_list; typedef flib::set<libpacman::package_ptr, libpacman::less<const package_ptr>> package_set; @@ -221,12 +218,12 @@ private: libpacman::package_set m_packages; }; + typedef flib::refcounted_ptr<libpacman::package_node> package_node_ptr; struct package_node_less { bool operator () (const package_node *p1, const package_node *p2); }; - - typedef flib::set<flib::refcounted_ptr<libpacman::package_node>, package_node_less> package_node_set; + typedef flib::set<libpacman::package_node_ptr, package_node_less> package_node_set; class package_graph : package_node_set @@ -236,7 +233,6 @@ private: }; } // namespace libpacman -int _pacman_pkg_cmp(const libpacman::package pkg1, const libpacman::package_ptr pkg2); const libpacman::package_ptr _pacman_pkg_isin(const char *needle, const libpacman::package_list &haystack); #endif /* _PACMAN_PACKAGE_H */ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git