summaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-11-04 21:24:40 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-11-04 21:24:40 +0000
commit12b9855339a3bbd05cc0636588ea68bf8db390f5 (patch)
treedd0ad2fc31061f3b3e150291f0583a3e304fc9f6 /src/modules/m_spanningtree
parent38d5fd9b40e126bfde51022dac8d5a8a1ff787a9 (diff)
Honking huge commit. Removal of DELETE() template that never worked right anyway
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8527 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_spanningtree')
-rw-r--r--src/modules/m_spanningtree/treeserver.cpp2
-rw-r--r--src/modules/m_spanningtree/treesocket1.cpp2
-rw-r--r--src/modules/m_spanningtree/utils.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 635d2cc18..3e13526aa 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -330,7 +330,7 @@ bool TreeServer::Tidy()
TreeServer* s = (TreeServer*)*a;
s->Tidy();
Children.erase(a);
- DELETE(s);
+ delete s;
stillchildren = true;
break;
}
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 488607c96..5fbb8ee2b 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -597,7 +597,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
SquitServer(from, Current);
Current->Tidy();
Current->GetParent()->DelChild(Current);
- DELETE(Current);
+ delete Current;
this->Instance->SNO->WriteToSnoMask('l',"Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers);
}
else
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index adeacb5bd..afd029c16 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -633,7 +633,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', link tag has the same server name as the local server!");
}
}
- DELETE(Conf);
+ delete Conf;
}
void SpanningTreeUtilities::DoFailOver(Link* x)