X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=9b98ca83badedc4b958e6ab5f3301e89b55b1b08;hb=8085aa879bd989b526791797910295944a364084;hp=eda1b74a397d7080a9c8af5d235f54d92fa06b87;hpb=0da6b3a13def40e8fd002b9fc60f955467f6372d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index eda1b74a3..9b98ca83b 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -87,10 +87,10 @@
  * Before you start screaming, this definition is only used here, so moving it to a header is pointless.
  * Yes, it's horrid. Blame cl for being different. -- w00t
  */
-#ifdef WINDOWS
-typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash_compare<irc::string, std::less<irc::string> > > watchentries;
+#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
+	typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash_compare<irc::string, std::less<irc::string> > > watchentries;
 #else
-typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash<irc::string> > watchentries;
+	typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash<irc::string> > watchentries;
 #endif
 typedef std::map<irc::string, std::string> watchlist;
 
@@ -367,20 +367,18 @@ class CommandWatch : public Command
 
 class Modulewatch : public Module
 {
-	CommandWatch* mycommand;
-	CommandSVSWatch *sw;
 	unsigned int maxwatch;
+	CommandWatch cmdw;
+	CommandSVSWatch sw;
 
  public:
 	Modulewatch(InspIRCd* Me)
-		: Module(Me), maxwatch(32)
+		: Module(Me), maxwatch(32), cmdw(Me, maxwatch), sw(Me)
 	{
 		OnRehash(NULL);
 		whos_watching_me = new watchentries();
-		mycommand = new CommandWatch(ServerInstance, maxwatch);
-		ServerInstance->AddCommand(mycommand);
-		sw = new CommandSVSWatch(ServerInstance);
-		ServerInstance->AddCommand(sw);
+		ServerInstance->AddCommand(&cmdw);
+		ServerInstance->AddCommand(&sw);
 		Implementation eventlist[] = { I_OnRehash, I_OnGarbageCollect, I_OnCleanup, I_OnUserQuit, I_OnPostConnect, I_OnUserPostNick, I_On005Numeric, I_OnSetAway };
 		ServerInstance->Modules->Attach(eventlist, this, 8);
 	}