Windows

5 files changed, 8 insertions, 6 deletions

diff --git a/src/access.cpp b/src/access.cpp
index 7639b7723..32c648857 100644
--- a/src/access.cpp
+++ b/src/access.cpp
@@ -65,7 +65,7 @@ void PrivilegeManager::ClearPrivileges()
 	privs.clear();
 }
 
-AccessProvider::AccessProvider(Module *o, const Anope::string &n) : Service<AccessProvider>(o, n)
+AccessProvider::AccessProvider(Module *o, const Anope::string &n) : Service(o, "AccessProvider", n)
 {
 }
 
@@ -103,7 +103,7 @@ Serializable::serialized_data ChanAccess::serialize()
 
 void ChanAccess::unserialize(serialized_data &data)
 {
-	service_reference<AccessProvider> aprovider(data["provider"].astr());
+	service_reference<AccessProvider> aprovider("AccessProvider", data["provider"].astr());
 	ChannelInfo *ci = cs_findchan(data["ci"].astr());
 	if (!aprovider || !ci)
 		return;
diff --git a/src/base.cpp b/src/base.cpp
index 98734d34d..f8b393774 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -6,6 +6,8 @@ std::vector<Anope::string> SerializeType::type_order;
 Anope::map<SerializeType *> SerializeType::types;
 std::list<Serializable *> *Serializable::serizliable_items;
 
+Anope::map<Anope::map<Service *> > Service::services;
+
 void RegisterTypes()
 {
 	static SerializeType nc("NickCore", NickCore::unserialize), na("NickAlias", NickAlias::unserialize), bi("BotInfo", BotInfo::unserialize),
diff --git a/src/bots.cpp b/src/bots.cpp
index 851177b9e..a6cc1c06f 100644
--- a/src/bots.cpp
+++ b/src/bots.cpp
@@ -244,7 +244,7 @@ void BotInfo::OnMessage(User *u, const Anope::string &message)
 	}
 
 	CommandInfo &info = it->second;
-	service_reference<Command> c(info.name);
+	service_reference<Command> c("Command", info.name);
 	if (!c)
 	{
 		if (has_help)
diff --git a/src/command.cpp b/src/command.cpp
index cbd4d8042..75271867b 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -34,7 +34,7 @@ void CommandSource::Reply(const Anope::string &message)
 		u->SendMessage(this->service, tok);
 }
 
-Command::Command(Module *o, const Anope::string &sname, size_t min_params, size_t max_params) : Service<Command>(o, sname), Flags<CommandFlag>(CommandFlagStrings), MaxParams(max_params), MinParams(min_params), module(owner)
+Command::Command(Module *o, const Anope::string &sname, size_t min_params, size_t max_params) : Service(o, "Command", sname), Flags<CommandFlag>(CommandFlagStrings), MaxParams(max_params), MinParams(min_params), module(owner)
 {
 }
 
diff --git a/src/operserv.cpp b/src/operserv.cpp
index 42a5c2f5b..6793581e0 100644
--- a/src/operserv.cpp
+++ b/src/operserv.cpp
@@ -92,7 +92,7 @@ Serializable::serialized_data XLine::serialize()
 
 void XLine::unserialize(serialized_data &data)
 {
-	service_reference<XLineManager> xlm(data["manager"].astr());
+	service_reference<XLineManager> xlm("XLineManager", data["manager"].astr());
 	if (!xlm)
 		return;
 
@@ -172,7 +172,7 @@ Anope::string XLineManager::GenerateUID()
 
 /** Constructor
  */
-XLineManager::XLineManager(Module *creator, const Anope::string &xname, char t) : Service<XLineManager>(creator, xname), type(t)
+XLineManager::XLineManager(Module *creator, const Anope::string &xname, char t) : Service(creator, "XLineManager", xname), type(t)
 {
 }