Remove SpanningTreeProtocolInterface::SendOperNotice - it was translated to a SendSNO...

[user/henk/code/inspircd.git] / include / hashcomp.h

diff --git a/include/hashcomp.h b/include/hashcomp.h
index dc07c190e8b62e063283d253c8dfa18e88b00443..4eb65823db6e775743a18ff7aebe37f5ebe399d0 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -14,8 +14,8 @@
 #ifndef _HASHCOMP_H_
 #define _HASHCOMP_H_
 
-#include "inspircd_config.h"
-#include "socket.h"
+//#include "inspircd_config.h"
+//#include "socket.h"
 #include "hash_map.h"
 
 /*******************************************************
@@ -33,15 +33,6 @@
  * aware of irc::string.
  *******************************************************/
 
-/** Required namespaces and symbols */
-using namespace std;
-
-/** aton() */
-using irc::sockets::insp_aton;
-
-/** nota() */
-using irc::sockets::insp_ntoa;
-
 #ifndef LOWERMAP
 #define LOWERMAP
 /** A mapping of uppercase to lowercase, including scandinavian
@@ -133,15 +124,15 @@ namespace irc
 
        /** This typedef declares irc::string based upon irc_char_traits.
         */
-       typedef basic_string<char, irc_char_traits, allocator<char> > string;
+       typedef std::basic_string<char, irc_char_traits, std::allocator<char> > string;
 
        /** irc::stringjoiner joins string lists into a string, using
         * the given seperator string.
         * This class can join a vector of std::string, a deque of
-        * std::string, or a const char** array, using overloaded
+        * std::string, or a const char* const* array, using overloaded
         * constructors.
         */
-       class CoreExport stringjoiner
+       class CoreExport stringjoiner : public classbase
        {
         private:
                /** Output string
@@ -168,7 +159,7 @@ namespace irc
                 * @param begin The starting element in the sequence to be joined
                 * @param end The ending element in the sequence to be joined
                 */
-               stringjoiner(const std::string &seperator, const char** sequence, int begin, int end);
+               stringjoiner(const std::string &seperator, const char* const* sequence, int begin, int end);
 
                /** Get the joined sequence
                 * @return A reference to the joined string
@@ -180,7 +171,7 @@ namespace irc
         * It can then reproduce this list, clamped to a maximum of MAXMODES
         * values per line.
         */
-       class CoreExport modestacker
+       class CoreExport modestacker : public classbase
        {
         private:
                /** The mode sequence and its parameters
@@ -251,7 +242,7 @@ namespace irc
         * list will be ":item". This is to allow for parsing 'source' fields
         * from data.
         */
-       class CoreExport tokenstream
+       class CoreExport tokenstream : public classbase
        {
         private:
                /** Original string
@@ -711,7 +702,7 @@ namespace nspace
                * @param s A string to hash
                * @return The hash value
                */
-               size_t operator()(const string &s) const;
+               size_t operator()(const std::string &s) const;
        };
 #endif