Buggy compilers are buggy

5 files changed, 3 insertions, 9 deletions

diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp
index 228da91a5..e146544f4 100644
--- a/modules/pseudoclients/global.cpp
+++ b/modules/pseudoclients/global.cpp
@@ -75,13 +75,13 @@ class GlobalCore : public Module
 	void OnRestart() anope_override
 	{
 		if (Config->GlobalOnCycle)
-			GlobalService->SendGlobal(Global, "", Config->GlobalOnCycleMessage);
+			this->myglobalservice.SendGlobal(Global, "", Config->GlobalOnCycleMessage);
 	}
 	
 	void OnShutdown() anope_override
 	{
 		if (Config->GlobalOnCycle)
-			GlobalService->SendGlobal(Global, "", Config->GlobalOnCycleMessage);
+			this->myglobalservice.SendGlobal(Global, "", Config->GlobalOnCycleMessage);
 	}
 
 	void OnNewServer(Server *s) anope_override
diff --git a/modules/pseudoclients/global.h b/modules/pseudoclients/global.h
index 7a2dc1830..fccd96558 100644
--- a/modules/pseudoclients/global.h
+++ b/modules/pseudoclients/global.h
@@ -14,7 +14,5 @@ class GlobalService : public Service
 	virtual void SendGlobal(const BotInfo *sender, const Anope::string &source, const Anope::string &message) = 0;
 };
 
-static ServiceReference<GlobalService> GlobalService("GlobalService", "Global");
-
 #endif // GLOBAL_H
 
diff --git a/modules/pseudoclients/memoserv.h b/modules/pseudoclients/memoserv.h
index 35a187d53..e314c7208 100644
--- a/modules/pseudoclients/memoserv.h
+++ b/modules/pseudoclients/memoserv.h
@@ -35,7 +35,5 @@ class MemoServService : public Service
 	virtual void Check(User *u) = 0;
 };
 
-static ServiceReference<MemoServService> MemoServService("MemoServService", "MemoServ");
-
 #endif // MEMOSERV_H
 
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index 8a56c86ae..ba2f47478 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -328,7 +328,7 @@ class NickServCore : public Module
 		{
 			User *u = it->second;
 			if (u->server == s && !u->IsIdentified())
-				NickServService->Validate(u);
+				this->mynickserv.Validate(u);
 		}
 	}
 
diff --git a/modules/pseudoclients/nickserv.h b/modules/pseudoclients/nickserv.h
index 1037522ce..63923de2b 100644
--- a/modules/pseudoclients/nickserv.h
+++ b/modules/pseudoclients/nickserv.h
@@ -10,7 +10,5 @@ class NickServService : public Service
 	virtual void Login(User *u, NickAlias *na) = 0;
 };
 
-static ServiceReference<NickServService> NickServService("NickServService", "NickServ");
-
 #endif // NICKSERV_H