diff options
| -rw-r--r-- | src/adlmidi_bankmap.tcc | 16 | ||||
| -rw-r--r-- | src/adlmidi_ptr.hpp | 176 |
2 files changed, 94 insertions, 98 deletions
diff --git a/src/adlmidi_bankmap.tcc b/src/adlmidi_bankmap.tcc index 0387418..938192d 100644 --- a/src/adlmidi_bankmap.tcc +++ b/src/adlmidi_bankmap.tcc @@ -57,7 +57,7 @@ void BasicBankMap<T>::reserve(size_t capacity) m_capacity += need; for(size_t i = need; i-- > 0;) - free_slot(&slots.get()[i]); + free_slot(&slots[i]); } template <class T> @@ -65,7 +65,7 @@ typename BasicBankMap<T>::iterator BasicBankMap<T>::begin() const { iterator it(m_buckets.get(), NULL, 0); - while(it.index < hash_buckets && !(it.slot = m_buckets.get()[it.index])) + while(it.index < hash_buckets && !(it.slot = m_buckets[it.index])) ++it.index; return it; } @@ -176,12 +176,12 @@ template <class T> void BasicBankMap<T>::clear() { for(size_t i = 0; i < hash_buckets; ++i) { - Slot *slot = m_buckets.get()[i]; + Slot *slot = m_buckets[i]; while (Slot *cur = slot) { slot = slot->next; free_slot(cur); } - m_buckets.get()[i] = NULL; + m_buckets[i] = NULL; } m_size = 0; } @@ -231,7 +231,7 @@ template <class T> typename BasicBankMap<T>::Slot * BasicBankMap<T>::bucket_find(size_t index, key_type key) { - Slot *slot = m_buckets.get()[index]; + Slot *slot = m_buckets[index]; while(slot && slot->value.first != key) slot = slot->next; return slot; @@ -241,11 +241,11 @@ template <class T> void BasicBankMap<T>::bucket_add(size_t index, Slot *slot) { assert(slot); - Slot *next = m_buckets.get()[index]; + Slot *next = m_buckets[index]; if(next) next->prev = slot; slot->next = next; - m_buckets.get()[index] = slot; + m_buckets[index] = slot; } template <class T> @@ -255,7 +255,7 @@ void BasicBankMap<T>::bucket_remove(size_t index, Slot *slot) Slot *prev = slot->prev; Slot *next = slot->next; if(!prev) - m_buckets.get()[index] = next; + m_buckets[index] = next; else prev->next = next; if(next) diff --git a/src/adlmidi_ptr.hpp b/src/adlmidi_ptr.hpp index 1e1a5f4..7d1086b 100644 --- a/src/adlmidi_ptr.hpp +++ b/src/adlmidi_ptr.hpp @@ -24,132 +24,122 @@ #ifndef ADLMIDI_PTR_HPP_THING #define ADLMIDI_PTR_HPP_THING +#include <algorithm> // swap #include <stddef.h> +#include <stdlib.h> /* - Smart pointer for C heaps, created with malloc() call. - FAQ: Why not std::shared_ptr? Because of Android NDK now doesn't supports it + Generic deleters for smart pointers + */ +template <class T> +struct ADLMIDI_DefaultDelete +{ + void operator()(T *x) { delete x; } +}; +template <class T> +struct ADLMIDI_DefaultArrayDelete +{ + void operator()(T *x) { delete[] x; } +}; +struct ADLMIDI_CDelete +{ + void operator()(void *x) { free(x); } +}; + +/* + Safe unique pointer for C++98, non-copyable but swappable. */ -template<class PTR> -class AdlMIDI_CPtr +template< class T, class Deleter = ADLMIDI_DefaultDelete<T> > +class AdlMIDI_UPtr { - PTR *m_p; + T *m_p; public: - AdlMIDI_CPtr() : m_p(NULL) {} - ~AdlMIDI_CPtr() + explicit AdlMIDI_UPtr(T *p) + : m_p(p) {} + ~AdlMIDI_UPtr() { - reset(NULL); + reset(); } - void reset(PTR *p = NULL) + void reset(T *p = NULL) { if(p != m_p) { - if(m_p) - free(m_p); + if(m_p) { + Deleter del; + del(m_p); + } m_p = p; } } - PTR *get() - { - return m_p; - } - PTR &operator*() - { - return *m_p; - } - PTR *operator->() + void swap(AdlMIDI_UPtr &other) { - return m_p; - } -private: - AdlMIDI_CPtr(const AdlMIDI_CPtr &); - AdlMIDI_CPtr &operator=(const AdlMIDI_CPtr &); -}; - -template<class PTR> -class AdlMIDI_NArrPtr -{ - PTR *m_p; -public: - AdlMIDI_NArrPtr() : m_p(NULL) {} - AdlMIDI_NArrPtr(PTR *value) - { - reset(value); - } - - ~AdlMIDI_NArrPtr() - { - reset(NULL); + std::swap(m_p, other.m_p); } - void reset(PTR *p = NULL) - { - if(p != m_p) { - if(m_p) - delete [] m_p; - m_p = p; - } - } - - PTR *get() + T *get() const { return m_p; } - PTR &operator*() + T &operator*() const { return *m_p; } - PTR *operator->() + T *operator->() const { return m_p; } - PTR operator[](size_t index) + T &operator[](size_t index) const { return m_p[index]; } - const PTR operator[](size_t index) const - { - return m_p[index]; - } - AdlMIDI_NArrPtr(AdlMIDI_NArrPtr &other) - { - m_p = other.m_p; - other.m_p = NULL; - } - AdlMIDI_NArrPtr &operator=(AdlMIDI_NArrPtr &other) - { - m_p = other.m_p; - other.m_p = NULL; - return m_p; - } +private: + AdlMIDI_UPtr(const AdlMIDI_UPtr &); + AdlMIDI_UPtr &operator=(const AdlMIDI_UPtr &); }; -/* - Generic deleters for smart pointers - */ template <class T> -struct ADLMIDI_DefaultDelete +void swap(AdlMIDI_UPtr<T> &a, AdlMIDI_UPtr<T> &b) { - void operator()(T *x) { delete x; } + a.swap(b); +} + +/** + Unique pointer for arrays. + */ +template<class T> +class AdlMIDI_UPtrArray : + public AdlMIDI_UPtr< T, ADLMIDI_DefaultArrayDelete<T> > +{ +public: + explicit AdlMIDI_UPtrArray(T *p = NULL) + : AdlMIDI_UPtr< T, ADLMIDI_DefaultArrayDelete<T> >(p) {} }; -template <class T> -struct ADLMIDI_DefaultArrayDelete + +/** + Unique pointer for C memory. + */ +template<class T> +class AdlMIDI_CPtr : + public AdlMIDI_UPtr< T, ADLMIDI_CDelete > { - void operator()(T *x) { delete[] x; } +public: + explicit AdlMIDI_CPtr(T *p = NULL) + : AdlMIDI_UPtr< T, ADLMIDI_CDelete >(p) {} }; /* Shared pointer with non-atomic counter FAQ: Why not std::shared_ptr? Because of Android NDK now doesn't supports it */ -template< class VALUE, class DELETER = ADLMIDI_DefaultDelete<VALUE> > +template< class T, class Deleter = ADLMIDI_DefaultDelete<T> > class AdlMIDI_SPtr { - VALUE *m_p; + T *m_p; size_t *m_counter; public: - AdlMIDI_SPtr() : m_p(NULL), m_counter(NULL) {} + explicit AdlMIDI_SPtr(T *p = NULL) + : m_p(p), m_counter(p ? new size_t(1) : NULL) {} ~AdlMIDI_SPtr() { reset(NULL); @@ -174,11 +164,11 @@ public: return *this; } - void reset(VALUE *p = NULL) + void reset(T *p = NULL) { if(p != m_p) { if(m_p && --*m_counter == 0) { - DELETER del; + Deleter del; del(m_p); if(!p) { delete m_counter; @@ -194,28 +184,34 @@ public: } } - VALUE *get() const + T *get() const { return m_p; } - VALUE &operator*() + T &operator*() const { return *m_p; } - const VALUE &operator*() const + T *operator->() const { - return *m_p; + return m_p; } - VALUE *operator->() const + T &operator[](size_t index) const { - return m_p; + return m_p[index]; } }; -template<class VALUE> +/** + Shared pointer for arrays. + */ +template<class T> class AdlMIDI_SPtrArray : - public AdlMIDI_SPtr< VALUE, ADLMIDI_DefaultArrayDelete<VALUE> > + public AdlMIDI_SPtr< T, ADLMIDI_DefaultArrayDelete<T> > { +public: + explicit AdlMIDI_SPtrArray(T *p = NULL) + : AdlMIDI_SPtr< T, ADLMIDI_DefaultArrayDelete<T> >(p) {} }; #endif //ADLMIDI_PTR_HPP_THING |