X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=ad6a2133e8fdbeafcd3a643205e3b55920fa9b04;hb=6ab0b94dceb7d7f0bfca39976e745f22c7ba8939;hp=32d155e30b9df5b04224190c8bec3fccf70b9a88;hpb=76317750956e2bf4b80478e4f0f04160d12347ce;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 32d155e30..ad6a2133e 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *                <Craig@chatspike.net>
@@ -18,47 +18,34 @@
 #define _HASHCOMP_H_
 
 #include "inspircd_config.h"
+#include "socket.h"
+#include "hash_map.h"
 
-/**
+/*******************************************************
  * This file contains classes and templates that deal
  * with the comparison and hashing of 'irc strings'.
  * An 'irc string' is a string which compares in a
  * case insensitive manner, and as per RFC 1459 will
  * treat [ identical to {, ] identical to }, and \
- * as identical to |. Our hashing functions are designed
- * to accept std::string and compare/hash them in an irc
- * type way, irc::string is a seperate class type currently.
- */
-
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
+ * as identical to |.
+ *
+ * Our hashing functions are designed  to accept
+ * std::string and compare/hash them as type irc::string
+ * by converting them internally. This makes them
+ * backwards compatible with other code which is not
+ * aware of irc::string.
+ *******************************************************/
+ 
 using namespace std;
 
 namespace nspace
 {
-#ifdef GCC34
         template<> struct hash<in_addr>
-#else
-        template<> struct nspace::hash<in_addr>
-#endif
         {
                 size_t operator()(const struct in_addr &a) const;
         };
-#ifdef GCC34
-        template<> struct hash<string>
-#else
-        template<> struct nspace::hash<string>
-#endif
+
+        template<> struct hash<std::string>
         {
                 size_t operator()(const string &s) const;
         };
@@ -92,6 +79,19 @@ namespace irc
 	        bool operator()(const in_addr &s1, const in_addr &s2) const;
 	};
 
+	class tokenstream
+	{
+	 private:
+		std::string tokenbuffer;
+		std::vector<std::string> tokens;
+	 public:
+		tokenstream(std::string &source);
+		~tokenstream();
+
+		unsigned int GetNumTokens();
+		const std::string& GetToken(unsigned int index);
+	};
+
 
 	/** 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-
@@ -125,4 +125,20 @@ namespace irc
 	typedef basic_string<char, irc_char_traits, allocator<char> > string;
 }
 
+/* Define operators for using >> and << with irc::string to an ostream on an istream. */
+/* This was endless fun. No. Really. */
+/* It was also the first core change Ommeh made, if anyone cares */
+
+std::ostream& operator<<(std::ostream &os, const irc::string &str);
+std::istream& operator>>(std::istream &is, irc::string &str);
+
+/* Define operators for + and == with irc::string to std::string for easy assignment
+ * and comparison - Brain
+ */
+
+std::string operator+ (std::string& leftval, irc::string& rightval);
+irc::string operator+ (irc::string& leftval, std::string& rightval);
+bool operator== (std::string& leftval, irc::string& rightval);
+bool operator== (irc::string& leftval, std::string& rightval);
+
 #endif