Merge pull request #531 from SaberUK/master+snprintf-removal

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

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 449b367b984365adea4d6b21385af12aa1469acc..3963f96e7b89fb347b0e46236b73bd7c153296f8 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -22,8 +22,7 @@
  */
 
 
-#ifndef HASHCOMP_H
-#define HASHCOMP_H
+#pragma once
 
 #include <cstring>
 #include <string>
@@ -110,6 +109,11 @@ namespace irc
                bool operator()(const std::string& s1, const std::string& s2) const;
        };
 
+       struct insensitive
+       {
+               size_t CoreExport operator()(const std::string &s) const;
+       };
+
        /** The irc_char_traits class is used for RFC-style comparison of strings.
         * This class is used to implement irc::string, a case-insensitive, RFC-
         * comparing string class.
@@ -281,14 +285,6 @@ namespace irc
                 */
                int GetStackedLine(std::vector<std::string> &result, int max_line_size = 360);
 
-               /** deprecated compatability interface - TODO remove */
-               int GetStackedLine(std::deque<std::string> &result, int max_line_size = 360) {
-                       std::vector<std::string> r;
-                       int n = GetStackedLine(r, max_line_size);
-                       result.clear();
-                       result.insert(result.end(), r.begin(), r.end());
-                       return n;
-               }
        };
 
        /** irc::tokenstream reads a string formatted as per RFC1459 and RFC2812.
@@ -590,23 +586,3 @@ inline std::string& trim(std::string &str)
 
        return str;
 }
-
-namespace std
-{
-       namespace tr1
-       {
-               
-               struct insensitive
-               {
-                       size_t CoreExport operator()(const std::string &s) const;
-               };
-               
-        /** Convert a string to lower case respecting RFC1459
-        * @param n A string to lowercase
-        */
-        void strlower(char *n);
-               
-       }
-}
-
-#endif