diff options
| author | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-03 23:20:20 +0000 |
|---|---|---|
| committer | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-03 23:20:20 +0000 |
| commit | f1271614679843191bb247c0db2716acb5ac0e4b (patch) | |
| tree | fefd14e99f56bf6bc6f4c42bb58f3f7da1a310c8 /include/hashcomp.h | |
| parent | 34fe4276bd6bc6fee5293d4817c8e36e4fffd75c (diff) | |
Clear up header insanity
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8808 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include/hashcomp.h')
| -rw-r--r-- | include/hashcomp.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/include/hashcomp.h b/include/hashcomp.h index dc07c190e..eafc74abf 100644 --- 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,7 +124,7 @@ 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. @@ -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 |