Forward port and make work with trunk. Original code of this module by Carsten Valdem...

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

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 00c9b692488e3c0a9c6b12dd755a9038f0ca39e8..ed285c783ff97f535ba7b18d042b738301ef95b9 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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,12 +124,12 @@ 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
@@ -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
@@ -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