From 8cce88f8706ca6fb52592458aa12641c43469a6e Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Wed, 16 May 2018 03:27:07 +0200 Subject: c++98 support for bank map --- src/adlmidi_ptr.hpp | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'src/adlmidi_ptr.hpp') diff --git a/src/adlmidi_ptr.hpp b/src/adlmidi_ptr.hpp index bd2b8fb..7faacff 100644 --- a/src/adlmidi_ptr.hpp +++ b/src/adlmidi_ptr.hpp @@ -122,11 +122,25 @@ public: } }; +/* + Generic deleters for smart pointers + */ +template +struct ADLMIDI_DefaultDelete +{ + void operator()(T *x) { delete x; } +}; +template +struct ADLMIDI_DefaultArrayDelete +{ + void operator()(T *x) { delete[] x; } +}; + /* Shared pointer with non-atomic counter FAQ: Why not std::shared_ptr? Because of Android NDK now doesn't supports it */ -template +template< class VALUE, class DELETER = ADLMIDI_DefaultDelete > class AdlMIDI_SPtr { VALUE *m_p; @@ -160,8 +174,10 @@ public: void reset(VALUE *p = NULL) { if(p != m_p) { - if(m_p && --*m_counter == 0) - delete m_p; + if(m_p && --*m_counter == 0) { + DELETER del; + del(m_p); + } m_p = p; if(!p) { if(m_counter) { @@ -178,7 +194,7 @@ public: } } - VALUE *get() + VALUE *get() const { return m_p; } @@ -186,10 +202,20 @@ public: { return *m_p; } - VALUE *operator->() + const VALUE &operator*() const + { + return *m_p; + } + VALUE *operator->() const { return m_p; } }; +template +class AdlMIDI_SPtrArray : + public AdlMIDI_SPtr< VALUE, ADLMIDI_DefaultArrayDelete > +{ +}; + #endif //ADLMIDI_PTR_HPP_THING -- cgit v1.2.3