aboutsummaryrefslogtreecommitdiff
path: root/src/base.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2019-08-13 16:05:57 +0100
committerGravatar Sadie Powell2019-08-13 16:59:04 +0100
commitb39bd5f49c7e09de9007af786d4f50f1b34dd435 (patch)
tree7a12d116dd231d9fb83c3b632d312228ed0d49d6 /src/base.cpp
parentMerge branch 'insp3' into master. (diff)
Rename ExtensionItem::free to ExtensionItem::Delete.
Diffstat (limited to 'src/base.cpp')
-rw-r--r--src/base.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/base.cpp b/src/base.cpp
index 6e7b64895..094ea6222 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -186,7 +186,7 @@ void Extensible::doUnhookExtensions(const std::vector<reference<ExtensionItem> >
ExtensibleStore::iterator e = extensions.find(item);
if (e != extensions.end())
{
- item->free(this, e->second);
+ item->Delete(this, e->second);
extensions.erase(e);
}
}
@@ -208,7 +208,7 @@ void Extensible::FreeAllExtItems()
{
for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i)
{
- i->first->free(this, i->second);
+ i->first->Delete(this, i->second);
}
extensions.clear();
}
@@ -301,7 +301,7 @@ intptr_t LocalIntExt::set(Extensible* container, intptr_t value)
return reinterpret_cast<intptr_t>(unset_raw(container));
}
-void LocalIntExt::free(Extensible* container, void* item)
+void LocalIntExt::Delete(Extensible* container, void* item)
{
}
@@ -335,16 +335,16 @@ void StringExtItem::FromNetwork(Extensible* container, const std::string& value)
void StringExtItem::set(Extensible* container, const std::string& value)
{
void* old = set_raw(container, new std::string(value));
- free(container, old);
+ Delete(container, old);
}
void StringExtItem::unset(Extensible* container)
{
void* old = unset_raw(container);
- free(container, old);
+ Delete(container, old);
}
-void StringExtItem::free(Extensible* container, void* item)
+void StringExtItem::Delete(Extensible* container, void* item)
{
delete static_cast<std::string*>(item);
}