Move file inclusion logic into calcdep, and complain about ambiguous #include directi...

[user/henk/code/inspircd.git] / src / hashcomp.cpp

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 3db888af510c47214864b6d9ceea5d808772b327..6c0ce82b852a62cecb7bf304fdf37bf4eba31de5 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -60,14 +60,14 @@ void nspace::strlower(char *n)
        }
 }
 
-#ifndef WIN32
+#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
+       size_t nspace::hash_compare<std::string, std::less<std::string> >::operator()(const std::string &s) const
+#else
        #ifdef HASHMAP_DEPRECATED
-               size_t nspace::insensitive::operator()(const std::string &s) const
+               size_t CoreExport nspace::insensitive::operator()(const std::string &s) const
        #else
                size_t nspace::hash<std::string>::operator()(const std::string &s) const
        #endif
-#else
-       size_t nspace::hash_compare<std::string, std::less<std::string> >::operator()(const std::string &s) const
 #endif
 {
        /* XXX: NO DATA COPIES! :)
@@ -83,10 +83,10 @@ void nspace::strlower(char *n)
 }
 
 
-#ifndef WIN32
-size_t nspace::hash<irc::string>::operator()(const irc::string &s) const
+#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
+       size_t nspace::hash_compare<irc::string, std::less<irc::string> >::operator()(const irc::string &s) const
 #else
-size_t nspace::hash_compare<irc::string, std::less<irc::string> >::operator()(const irc::string &s) const
+       size_t CoreExport nspace::hash<irc::string>::operator()(const irc::string &s) const
 #endif
 {
        register size_t t = 0;
@@ -154,7 +154,7 @@ const char* irc::irc_char_traits::find(const char* s1, int  n, char c)
 {
        while(n-- > 0 && national_case_insensitive_map[(unsigned char)*s1] != national_case_insensitive_map[(unsigned char)c])
                s1++;
-       return s1;
+       return (n >= 0) ? s1 : NULL;
 }
 
 irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)