X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=78d7ee878d230719ca692ff9b13fe2f9ac674023;hb=772dad05a42e20e03a5445b84a7f6612ee44283f;hp=d9516e7fa4707936997e6468f3c52466404c9d0b;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hashcomp.h b/include/hashcomp.h
index d9516e7fa..78d7ee878 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -157,7 +157,7 @@ namespace irc
 
 	/** Compose a hex string from raw data.
 	 * @param raw The raw data to compose hex from
-	 * @pram rawsz The size of the raw data buffer
+	 * @param rawsz The size of the raw data buffer
 	 * @return The hex string.
 	 */
 	CoreExport std::string hex(const unsigned char *raw, size_t rawsz);
@@ -441,7 +441,7 @@ namespace irc
 
 		/** Used to split on commas
 		 */
-		commasepstream* sep;
+		commasepstream sep;
 
 		/** Current position in a range of ports
 		 */
@@ -462,7 +462,7 @@ namespace irc
 		/** Used to determine overlapping of ports
 		 * without O(n) algorithm being used
 		 */
-		std::map<long, bool> overlap_set;
+		std::set<long> overlap_set;
 
 		/** Returns true if val overlaps an existing range
 		 */
@@ -475,10 +475,6 @@ namespace irc
 		 */
 		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
 		 */
@@ -596,13 +592,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. Except, of course, with TR1, when it's the same as GCC.
+ * \#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
 	 */
-#if defined(WINDOWS) && !defined(HAS_TR1_UNORDERED)
+#if defined(_WIN32) && !defined(HAS_TR1_UNORDERED)
 	template<> class CoreExport hash_compare<irc::string, std::less<irc::string> >
 	{
 	public: