Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=942fa53e37c416c4fa2dd479a8ee8474a8bea4ca
commit 942fa53e37c416c4fa2dd479a8ee8474a8bea4ca Author: Michel Hermier <[email protected]> Date: Sat Nov 1 09:22:24 2014 +0100 libpacman: Rename flib::refcounted_ptr to refcounted_shared_ptr. diff --git a/lib/libpacman/kernel/frefcounted.h b/lib/libpacman/kernel/frefcounted.h index 71fef3a..32ebefa 100644 --- a/lib/libpacman/kernel/frefcounted.h +++ b/lib/libpacman/kernel/frefcounted.h @@ -65,60 +65,60 @@ namespace flib }; template <class T> - class refcounted_ptr + class refcounted_shared_ptr { public: typedef T element_type; - constexpr refcounted_ptr() - : refcounted_ptr(nullptr) + constexpr refcounted_shared_ptr() + : refcounted_shared_ptr(nullptr) { } - constexpr refcounted_ptr(std::nullptr_t) + constexpr refcounted_shared_ptr(std::nullptr_t) : m_refcounted_ptr(nullptr) { } template <class Y> - explicit refcounted_ptr(Y *ptr) - : refcounted_ptr() + explicit refcounted_shared_ptr(Y *ptr) + : refcounted_shared_ptr() { reset(ptr); } template <class Y> - refcounted_ptr(const refcounted_ptr<Y> &o) - : refcounted_ptr(o.m_refcounted_ptr) + refcounted_shared_ptr(const refcounted_shared_ptr<Y> &o) + : refcounted_shared_ptr(o.m_refcounted_ptr) { } - refcounted_ptr(const refcounted_ptr &o) - : refcounted_ptr(o.m_refcounted_ptr) + refcounted_shared_ptr(const refcounted_shared_ptr &o) + : refcounted_shared_ptr(o.m_refcounted_ptr) { } - refcounted_ptr(refcounted_ptr &&o) - : refcounted_ptr() + refcounted_shared_ptr(refcounted_shared_ptr &&o) + : refcounted_shared_ptr() { swap(o); } - ~refcounted_ptr() + ~refcounted_shared_ptr() { reset(); } template <class Y> - refcounted_ptr &operator = (const refcounted_ptr<Y> &o) + refcounted_shared_ptr &operator = (const refcounted_shared_ptr<Y> &o) { reset(o.m_refcounted_ptr); return *this; } - refcounted_ptr &operator = (const refcounted_ptr &o) + refcounted_shared_ptr &operator = (const refcounted_shared_ptr &o) { reset(o.m_refcounted_ptr); return *this; } - refcounted_ptr &operator = (refcounted_ptr &&o) + refcounted_shared_ptr &operator = (refcounted_shared_ptr &&o) { swap(o); return *this; @@ -142,7 +142,7 @@ namespace flib m_refcounted_ptr = ptr; } - void swap(refcounted_ptr<T> &o) + void swap(refcounted_shared_ptr<T> &o) { std::swap(m_refcounted_ptr, o.m_refcounted_ptr); } @@ -179,25 +179,25 @@ namespace flib }; template <class T, class U> - bool operator == (const refcounted_ptr<T> &lhs, const refcounted_ptr<U> &rhs) + bool operator == (const refcounted_shared_ptr<T> &lhs, const refcounted_shared_ptr<U> &rhs) { return lhs.get() == rhs.get(); } template <class T> - bool operator == (const refcounted_ptr<T> &lhs, std::nullptr_t rhs) + bool operator == (const refcounted_shared_ptr<T> &lhs, std::nullptr_t rhs) { return lhs.get() == rhs; } template <class T, class U> - bool operator != (const refcounted_ptr<T> &lhs, const refcounted_ptr<U> &rhs) + bool operator != (const refcounted_shared_ptr<T> &lhs, const refcounted_shared_ptr<U> &rhs) { return lhs.get() != rhs.get(); } template <class T> - bool operator != (const refcounted_ptr<T> &lhs, std::nullptr_t rhs) + bool operator != (const refcounted_shared_ptr<T> &lhs, std::nullptr_t rhs) { return lhs.get() != rhs; } @@ -206,13 +206,13 @@ namespace flib namespace std { template <class T> - bool operator == (nullptr_t lhs, const flib::refcounted_ptr<T> &rhs) + bool operator == (nullptr_t lhs, const flib::refcounted_shared_ptr<T> &rhs) { return lhs == rhs.get(); } template <class T> - bool operator != (nullptr_t lhs, const flib::refcounted_ptr<T> &rhs) + bool operator != (nullptr_t lhs, const flib::refcounted_shared_ptr<T> &rhs) { return lhs != rhs.get(); } diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 49e9812..5f1dec1 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -176,7 +176,7 @@ public: char *m_path; }; - typedef flib::refcounted_ptr<package> package_ptr; + typedef flib::refcounted_shared_ptr<package> package_ptr; bool operator < (const package_ptr &pkg1, const package_ptr &pkg2); typedef FList<package_ptr> package_list; diff --git a/lib/libpacman/package_graph.cpp b/lib/libpacman/package_graph.cpp index 3d95bd5..23034a8 100644 --- a/lib/libpacman/package_graph.cpp +++ b/lib/libpacman/package_graph.cpp @@ -68,4 +68,14 @@ bool libpacman::operator < (const libpacman::package_node_ptr &pn1, const libpac return pn1->name() < pn2->name(); } +package_graph::package_graph() +{ } + +package_node_ptr package_graph::create(const str &pkgname) +{ + package_node_ptr node; + + return node; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/package_graph.h b/lib/libpacman/package_graph.h index e9f0443..44c8db6 100644 --- a/lib/libpacman/package_graph.h +++ b/lib/libpacman/package_graph.h @@ -40,16 +40,23 @@ namespace libpacman { libpacman::package_set m_packages; }; - typedef flib::refcounted_ptr<libpacman::package_node> package_node_ptr; + typedef flib::refcounted_shared_ptr<libpacman::package_node> package_node_ptr; bool operator < (const package_node_ptr &pn1, const package_node_ptr &pn2); typedef flib::set<libpacman::package_node_ptr> package_node_set; class package_graph - : package_node_set { public: - using package_node_set::package_node_set; + package_graph(); + + libpacman::package_node_ptr create(const flib::str &pkgname); + + private: + package_graph(const package_graph &o); + package_graph &operator = (const package_graph &o); + + package_node_set m_nodes; }; } // namespace libpacman _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
