Merge pull request #495 from SaberUK/master+fix-libcpp

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / utils.h

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index a82b9eb911fa3132f94876f5f241f697068091f9..36c161287932e2ecb72ff3116a2eaeccd34774bd 100644 (file)
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -20,8 +20,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_UTILS_H
-#define M_SPANNINGTREE_UTILS_H
+#pragma once
 
 #include "inspircd.h"
 
@@ -36,23 +35,19 @@ class SpanningTreeUtilities;
 /* This hash_map holds the hash equivalent of the server
  * tree, used for rapid linear lookups.
  */
-#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
-       typedef nspace::hash_map<std::string, TreeServer*, nspace::hash_compare<std::string, std::less<std::string> > > server_hash;
-#else
-       #ifdef HASHCOMP_DEPRECATED
-               typedef nspace::hash_map<std::string, TreeServer*, nspace::insensitive, irc::StrHashComp> server_hash;
-       #else
-               typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<std::string>, irc::StrHashComp> server_hash;
-       #endif
-#endif
-
-typedef std::map<TreeServer*,TreeServer*> TreeServerList;
+typedef TR1NS::unordered_map<std::string, TreeServer*, irc::insensitive, irc::StrHashComp> server_hash;
+
+typedef std::set<TreeServer*> TreeServerList;
 
 /** Contains helper functions and variables for this module,
  * and keeps them out of the global namespace
  */
 class SpanningTreeUtilities : public classbase
 {
+       /** Creates a line in the :<prefix> <command> [<params>] format
+        */
+       std::string ConstructLine(const std::string& prefix, const std::string& command, const parameterlist& params);
+
  public:
        /** Creator module
         */
@@ -133,36 +128,20 @@ class SpanningTreeUtilities : public classbase
 
        /** Send a message from this server to one other local or remote
         */
-       bool DoOneToOne(const std::string &prefix, const std::string &command, const parameterlist &params, std::string target);
+       bool DoOneToOne(const std::string& prefix, const std::string& command, const parameterlist& params, const std::string& target);
 
        /** Send a message from this server to all but one other, local or remote
         */
-       bool DoOneToAllButSender(const std::string &prefix, const std::string &command, const parameterlist &params, std::string omit);
-
-       /** Send a message from this server to all but one other, local or remote
-        */
-       bool DoOneToAllButSender(const char* prefix, const char* command, const parameterlist &params, std::string omit);
+       bool DoOneToAllButSender(const std::string &prefix, const std::string &command, const parameterlist& params, const std::string& omit);
 
        /** Send a message from this server to all others
         */
        bool DoOneToMany(const std::string &prefix, const std::string &command, const parameterlist &params);
 
-       /** Send a message from this server to all others
-        */
-       bool DoOneToMany(const char* prefix, const char* command, const parameterlist &params);
-
-       /** Send a message from this server to all others, without doing any processing on the command (e.g. send it as-is with colons and all)
-        */
-       bool DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, const parameterlist &params);
-
        /** Read the spanningtree module's tags from the config file
         */
        void ReadConfiguration();
 
-       /** Add a server to the server list for GetListOfServersForChannel
-        */
-       void AddThisServer(TreeServer* server, TreeServerList &list);
-
        /** Compile a list of servers which contain members of channel c
         */
        void GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list);
@@ -183,10 +162,6 @@ class SpanningTreeUtilities : public classbase
         */
        TreeServer* FindServerMask(const std::string &ServerName);
 
-       /** Returns true if this is a server name we recognise
-        */
-       bool IsServer(const std::string &ServerName);
-
        /** Find a link tag from a server name
         */
        Link* FindLink(const std::string& name);
@@ -194,6 +169,8 @@ class SpanningTreeUtilities : public classbase
        /** Refresh the IP cache used for allowing inbound connections
         */
        void RefreshIPCache();
-};
 
-#endif
+       /** Sends a PRIVMSG or a NOTICE to a channel obeying an exempt list and an optional prefix
+        */
+       void SendChannelMessage(const std::string& prefix, Channel* target, const std::string &text, char status, const CUList& exempt_list, const char* message_type);
+};