summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2012-10-12 04:04:14 -0400
committerAdam <Adam@anope.org>2012-10-13 00:37:10 -0400
commit76a0471c291d2b8045b52ec8e9d683a38bff47ff (patch)
tree0e464d4c131796f223dfe3d82feb9862300b7d23 /include
parente08422a4eafd7c1d317421ef4929a74f7005fd2d (diff)
Simplify the db_sql_live code since this isn't actually necessary. Fixes a problem internally ovwrwriting data on objects that we have modified and are queued because of assigning something to a serialize_obj reference
Diffstat (limited to 'include')
-rw-r--r--include/modules.h3
-rw-r--r--include/serialize.h9
2 files changed, 1 insertions, 11 deletions
diff --git a/include/modules.h b/include/modules.h
index 627bbab59..29da80cf3 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -927,7 +927,6 @@ class CoreExport Module : public Extensible
virtual void OnSerializeCheck(SerializeType *) { }
virtual void OnSerializableConstruct(Serializable *) { }
virtual void OnSerializableDestruct(Serializable *) { }
- virtual void OnSerializePtrAssign(Serializable *) { }
virtual void OnSerializableUpdate(Serializable *) { }
/** Called when a chanserv/set command is used
@@ -998,7 +997,7 @@ enum Implementation
I_OnChannelModeSet, I_OnChannelModeUnset, I_OnUserModeSet, I_OnUserModeUnset, I_OnChannelModeAdd, I_OnUserModeAdd,
I_OnMLock, I_OnUnMLock, I_OnServerSync, I_OnUplinkSync, I_OnBotPrivmsg, I_OnPrivmsg, I_OnLog,
- I_OnSerializeCheck, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializePtrAssign, I_OnSerializableUpdate,
+ I_OnSerializeCheck, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializableUpdate,
I_END
};
diff --git a/include/serialize.h b/include/serialize.h
index fd8e925ab..655501d47 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -254,10 +254,7 @@ class serialize_obj : public dynamic_reference_base
if (!this->invalid)
{
if (this->ref)
- {
- FOREACH_MOD(I_OnSerializePtrAssign, OnSerializePtrAssign(this->ref));
this->ref->QueueUpdate();
- }
return this->ref;
}
return NULL;
@@ -268,10 +265,7 @@ class serialize_obj : public dynamic_reference_base
if (!this->invalid)
{
if (this->ref)
- {
- FOREACH_MOD(I_OnSerializePtrAssign, OnSerializePtrAssign(this->ref));
this->ref->QueueUpdate();
- }
return this->ref;
}
return NULL;
@@ -282,10 +276,7 @@ class serialize_obj : public dynamic_reference_base
if (!this->invalid)
{
if (this->ref)
- {
- FOREACH_MOD(I_OnSerializePtrAssign, OnSerializePtrAssign(this->ref));
this->ref->QueueUpdate();
- }
return this->ref;
}
return NULL;