diff options
| author | Peter Powell <petpow@saberuk.com> | 2018-08-12 13:29:09 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2018-08-12 13:29:09 +0100 |
| commit | f8a9b6ba4ae0b4b3c7b2a408332230dd82eb4608 (patch) | |
| tree | 775ba30c21683d6b72bfe5c25ce96a213a34da42 /src/modules | |
| parent | 02838a09396a3626b61263791570e96324563fa0 (diff) | |
Pass the Extensible container to ExtensionItem::free().
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_callerid.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_monitor.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_sslinfo.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_topiclock.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index b0ec3b8ff..f50bdeedf 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -91,7 +91,7 @@ struct CallerIDExtInfo : public ExtensionItem void* old = get_raw(container); if (old) - this->free(old); + this->free(NULL, old); callerid_data* dat = new callerid_data; set_raw(container, dat); @@ -125,7 +125,7 @@ struct CallerIDExtInfo : public ExtensionItem return dat; } - void free(void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) CXX11_OVERRIDE { callerid_data* dat = static_cast<callerid_data*>(item); diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp index 38e7ccc3e..fd72c7320 100644 --- a/src/modules/m_monitor.cpp +++ b/src/modules/m_monitor.cpp @@ -79,7 +79,7 @@ class IRCv3::Monitor::Manager void unset(Extensible* container) { - free(unset_raw(container)); + free(container, unset_raw(container)); } std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE @@ -101,7 +101,7 @@ class IRCv3::Monitor::Manager void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE; - void free(void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) CXX11_OVERRIDE { delete static_cast<ExtData*>(item); } diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index 6f679a871..6d0a84249 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -79,7 +79,7 @@ class SSLCertExt : public ExtensionItem { } } - void free(void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) CXX11_OVERRIDE { ssl_cert* old = static_cast<ssl_cert*>(item); if (old && old->refcount_dec()) diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp index cbe524408..c65f27668 100644 --- a/src/modules/m_topiclock.cpp +++ b/src/modules/m_topiclock.cpp @@ -115,7 +115,7 @@ class FlagExtItem : public ExtensionItem unset_raw(container); } - void free(void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) CXX11_OVERRIDE { // nothing to free } |