X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=6cbc14850d00b6474f4ec2752b6917f925b8fc67;hb=74066e0f563ef630e432d3bbb10544318b70ade3;hp=eaafef2c6c27b33bfeed1f8d02a7050c12a28c62;hpb=2841f55d4b78eeab30e42835e298ee5141ea09dc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hashcomp.h b/include/hashcomp.h
index eaafef2c6..6cbc14850 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -251,8 +251,6 @@ namespace irc
 	class CoreExport modestacker : public classbase
 	{
 	 private:
-		InspIRCd* ServerInstance;
-
 		/** The mode sequence and its parameters
 		 */
 		std::deque<std::string> sequence;
@@ -268,7 +266,7 @@ namespace irc
 		 * @param add True if the stack is adding modes,
 		 * false if it is removing them
 		 */
-		modestacker(InspIRCd* Instance, bool add);
+		modestacker(bool add);
 
 		/** Push a modeletter and its parameter onto the stack.
 		 * No checking is performed as to if this mode actually
@@ -288,15 +286,15 @@ namespace irc
 		 * @param modeletter The mode letter to insert
 		 */
 		void Push(char modeletter);
-	
+
 		/** Push a '+' symbol onto the stack.
 		 */
 		void PushPlus();
-	
+
 		/** Push a '-' symbol onto the stack.
 		 */
 		void PushMinus();
-		
+
 		/** Return zero or more elements which form the
 		 * mode line. This will be clamped to a max of
 		 * MAXMODES items (MAXMODES-1 mode parameters and
@@ -304,7 +302,7 @@ namespace irc
 		 * characters. As specified below, this function
 		 * should be called in a loop until it returns zero,
 		 * indicating there are no more modes to return.
-		 * @param result The deque to populate. This will
+		 * @param result The vector to populate. This will not
 		 * be cleared before it is used.
 		 * @param max_line_size The maximum size of the line
 		 * to build, in characters, seperate to MAXMODES.
@@ -313,7 +311,16 @@ namespace irc
 		 * returns 0, in case there are multiple lines of
 		 * mode changes to be obtained.
 		 */
-		int GetStackedLine(std::deque<std::string> &result, int max_line_size = 360);
+		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.
@@ -331,7 +338,7 @@ namespace irc
 	class CoreExport tokenstream : public classbase
 	{
 	 private:
-	
+
 		/** Original string
 		 */
 		std::string tokens;
@@ -467,43 +474,43 @@ namespace irc
 		/** Used to split on commas
 		 */
 		commasepstream* sep;
-	
+
 		/** Current position in a range of ports
 		 */
 		long in_range;
-	
+
 		/** Starting port in a range of ports
 		 */
 		long range_begin;
-	
+
 		/** Ending port in a range of ports
 		 */
 		long range_end;
-	
+
 		/** Allow overlapped port ranges
 		 */
 		bool overlapped;
-	
+
 		/** Used to determine overlapping of ports
 		 * without O(n) algorithm being used
 		 */
 		std::map<long, bool> overlap_set;
-	
+
 		/** Returns true if val overlaps an existing range
 		 */
 		bool Overlaps(long val);
 	 public:
-	
+
 		/** Create a portparser and fill it with the provided data
 		 * @param source The source text to parse from
 		 * @param allow_overlapped Allow overlapped ranges
 		 */
 		portparser(const std::string &source, bool allow_overlapped = true);
-	
+
 		/** Frees the internal commasepstream object
 		 */
 		~portparser();
-	
+
 		/** Fetch the next token from the stream
 		 * @return The next port number is returned, or 0 if none remain
 		 */
@@ -627,13 +634,13 @@ inline std::string& trim(std::string &str)
 }
 
 /** Hashing stuff is totally different on vc++'s hash_map implementation, so to save a buttload of
- * #ifdefs we'll just do it all at once
+ * #ifdefs we'll just do it all at once. Except, of course, with TR1, when it's the same as GCC.
  */
 BEGIN_HASHMAP_NAMESPACE
 
 	/** Hashing function to hash irc::string
 	 */
-#ifdef WINDOWS
+#if defined(WINDOWS) && !defined(HAS_TR1_UNORDERED)
 	template<> class CoreExport hash_compare<irc::string, std::less<irc::string> >
 	{
 	public:
@@ -679,7 +686,7 @@ BEGIN_HASHMAP_NAMESPACE
 		 * @param s A string to hash
 		 * @return The hash value
 		 */
-		size_t operator()(const irc::string &s) const;
+		size_t CoreExport operator()(const irc::string &s) const;
 	};
 
 	/* XXX FIXME: Implement a hash function overriding std::string's that works with TR1! */
@@ -687,10 +694,10 @@ BEGIN_HASHMAP_NAMESPACE
 #ifdef HASHMAP_DEPRECATED
 	struct insensitive
 #else
-	template<> struct hash<std::string>
+	CoreExport template<> struct hash<std::string>
 #endif
 	{
-		size_t operator()(const std::string &s) const;
+		size_t CoreExport operator()(const std::string &s) const;
 	};
 
 #endif
@@ -703,4 +710,3 @@ BEGIN_HASHMAP_NAMESPACE
 END_HASHMAP_NAMESPACE
 
 #endif
-