diff options
author | 2016-06-07 15:15:37 -0400 | |
---|---|---|
committer | 2016-06-07 21:40:30 +0200 | |
commit | b27790890530b658e178846e7da01045185f0fce (patch) | |
tree | 95c027c901b343de6600a65d8d8f1beda51cbcdf /src/lib/netlist/plib/palloc.h | |
parent | 9137ace16ae5bed3f7164409a8622f61a9db2b80 (diff) |
- Minor cosmetic refactoring. Added a "uninitialised array" template to
allow in-place creation (for increased locality) of netlist classes.
Main use is in truthtable class.
- Remove PLIB_NAMESPACE macros.
- Remove namespace macros. Use explicit namespace declarations.
- Moved device definitions into cpp files.
- Moved more device definitions into cpp files.
- New prefix "nlid" for include files flags purely internal include
files not to be leaked into userland.
- Fix factory code.
Diffstat (limited to 'src/lib/netlist/plib/palloc.h')
-rw-r--r-- | src/lib/netlist/plib/palloc.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h index bd994466226..6b79d410bc8 100644 --- a/src/lib/netlist/plib/palloc.h +++ b/src/lib/netlist/plib/palloc.h @@ -36,7 +36,7 @@ #endif -PLIB_NAMESPACE_START() +namespace plib { //============================================================ // exception base @@ -77,7 +77,7 @@ template<typename T> void pfree_array(T *ptr) { delete [] ptr; } template<typename T, typename... Args> -std::unique_ptr<T> pmake_unique(Args&&... args) { +std::unique_ptr<T> make_unique(Args&&... args) { return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); } @@ -89,19 +89,19 @@ static std::unique_ptr<BC> make_unique_base(Args&&... args) } template <typename SC> -class powned_ptr +class owned_ptr { private: - powned_ptr() + owned_ptr() : m_ptr(nullptr), m_is_owned(true) { } public: - powned_ptr(SC *p, bool owned) + owned_ptr(SC *p, bool owned) : m_ptr(p), m_is_owned(owned) { } - powned_ptr(const powned_ptr &r) = delete; - powned_ptr & operator =(const powned_ptr &r) = delete; + owned_ptr(const owned_ptr &r) = delete; + owned_ptr & operator =(const owned_ptr &r) = delete; - powned_ptr(powned_ptr &&r) + owned_ptr(owned_ptr &&r) { m_is_owned = r.m_is_owned; m_ptr = r.m_ptr; @@ -110,7 +110,7 @@ public: } template<typename DC> - powned_ptr(powned_ptr<DC> &&r) + owned_ptr(owned_ptr<DC> &&r) { SC *dest_ptr = &dynamic_cast<SC &>(*r.get()); bool o = r.is_owned(); @@ -119,24 +119,24 @@ public: m_ptr = dest_ptr; } - ~powned_ptr() + ~owned_ptr() { if (m_is_owned) delete m_ptr; } template<typename DC, typename... Args> - static powned_ptr Create(Args&&... args) + static owned_ptr Create(Args&&... args) { - powned_ptr a; + owned_ptr a; DC *x = new DC(std::forward<Args>(args)...); a.m_ptr = static_cast<SC *>(x); return a; } template<typename... Args> - static powned_ptr Create(Args&&... args) + static owned_ptr Create(Args&&... args) { - powned_ptr a; + owned_ptr a; a.m_ptr = new SC(std::forward<Args>(args)...); return a; } @@ -149,7 +149,7 @@ public: bool is_owned() const { return m_is_owned; } template<typename DC> - powned_ptr<DC> & operator =(powned_ptr<DC> &r) + owned_ptr<DC> & operator =(owned_ptr<DC> &r) { m_is_owned = r.m_is_owned; m_ptr = r.m_ptr; @@ -165,7 +165,7 @@ private: bool m_is_owned; }; -class pmempool +class mempool { private: struct block @@ -186,8 +186,8 @@ private: }; public: - pmempool(int min_alloc, int min_align); - ~pmempool(); + mempool(int min_alloc, int min_align); + ~mempool(); void *alloc(size_t size); void free(void *ptr); @@ -198,6 +198,6 @@ public: std::vector<block> m_blocks; }; -PLIB_NAMESPACE_END() +} #endif /* PALLOC_H_ */ |