Merge pull request #452 from SaberUK/master+nuke-hashmap

Purge the deprecated hash_map from existance.

4 files changed, 100 insertions, 97 deletions

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 3fb7f84fb..a1e08bbf7 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -24,7 +24,6 @@
 
 #include "inspircd.h"
 #include "hashcomp.h"
-#include "hash_map.h"
 
 /******************************************************
  *
@@ -35,7 +34,7 @@
  * scene spend a lot of time debating (arguing) about
  * the best way to write hash functions to hash irc
  * nicknames, channels etc.
- * We are lucky as C++ developers as hash_map does
+ * We are lucky as C++ developers as unordered_map does
  * a lot of this for us. It does intellegent memory
  * requests, bucketing, search functions, insertion
  * and deletion etc. All we have to do is write some
@@ -51,74 +50,111 @@
  *
  ******************************************************/
 
-/** A mapping of uppercase to lowercase, including scandinavian
- * 'oddities' as specified by RFC1459, e.g. { -> [, and | -> \
+
+/**
+ * A case insensitive mapping of characters from upper case to lower case for
+ * the ASCII character set.
  */
-unsigned const char rfc_case_insensitive_map[256] = {
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,					/* 0-19 */
-	20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,				/* 20-39 */
-	40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,				/* 40-59 */
-	60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,		/* 60-79 */
-	112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 94, 95, 96, 97, 98, 99,		/* 80-99 */
-	100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,	/* 100-119 */
-	120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,	/* 120-139 */
-	140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,	/* 140-159 */
-	160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,	/* 160-179 */
-	180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,	/* 180-199 */
-	200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,	/* 200-219 */
-	220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,	/* 220-239 */
-	240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255				/* 240-255 */
+unsigned const char ascii_case_insensitive_map[256] = {
+	0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   // 0-9
+	10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  // 10-19
+	20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  // 20-29
+	30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  // 30-39
+	40,  41,  42,  43,  44,  45,  46,  47,  48,  49,  // 40-49
+	50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  // 50-59
+	60,  61,  62,  63,  64,  97,  98,  99,  100, 101, // 60-69
+	102, 103, 104, 105, 106, 107, 108, 109, 110, 111, // 70-79
+	112, 113, 114, 115, 116, 117, 118, 119, 120, 121, // 80-89
+	122, 91,  92,  93,  94,  95,  96,  97,  98,  99,  // 90-99
+	100, 101, 102, 103, 104, 105, 106, 107, 108, 109, // 100-109
+	110, 111, 112, 113, 114, 115, 116, 117, 118, 119, // 110-119
+	120, 121, 122, 123, 124, 125, 126, 127, 128, 129, // 120-129
+	130, 131, 132, 133, 134, 135, 136, 137, 138, 139, // 130-139
+	140, 141, 142, 143, 144, 145, 146, 147, 148, 149, // 140-149
+	150, 151, 152, 153, 154, 155, 156, 157, 158, 159, // 150-159
+	160, 161, 162, 163, 164, 165, 166, 167, 168, 169, // 160-169
+	170, 171, 172, 173, 174, 175, 176, 177, 178, 179, // 170-179
+	180, 181, 182, 183, 184, 185, 186, 187, 188, 189, // 180-189
+	190, 191, 192, 193, 194, 195, 196, 197, 198, 199, // 190-199
+	200, 201, 202, 203, 204, 205, 206, 207, 208, 209, // 200-209
+	210, 211, 212, 213, 214, 215, 216, 217, 218, 219, // 210-219
+	220, 221, 222, 223, 224, 225, 226, 227, 228, 229, // 220-229
+	230, 231, 232, 233, 234, 235, 236, 237, 238, 239, // 230-249
+	240, 241, 242, 243, 244, 245, 246, 247, 248, 249, // 240-249
+	250, 251, 252, 253, 254, 255,                     // 250-255
 };
 
-/** Case insensitive map, ASCII rules.
- * That is;
- * [ != {, but A == a.
+
+
+/**
+ * A case insensitive mapping of characters from upper case to lower case for
+ * the character set of RFC 1459. This is identical to ASCII with the small
+ * exception of {}| being considered to be the lower case equivalents of the
+ * characters []\ respectively.
  */
-unsigned const char ascii_case_insensitive_map[256] = {
-        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,                                   /* 0-19 */
-        20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,                         /* 20-39 */
-        40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,                         /* 40-59 */
-        60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,             /* 60-79 */
-        112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 91, 92, 93, 94, 95, 96, 97, 98, 99,              /* 80-99 */
-        100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,     /* 100-119 */
-        120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,     /* 120-139 */
-        140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,     /* 140-159 */
-        160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,     /* 160-179 */
-        180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,     /* 180-199 */
-        200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,     /* 200-219 */
-        220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,     /* 220-239 */
-        240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255                          /* 240-255 */
+unsigned const char rfc_case_insensitive_map[256] = {
+	0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   // 0-9
+	10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  // 10-19
+	20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  // 20-29
+	30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  // 30-39
+	40,  41,  42,  43,  44,  45,  46,  47,  48,  49,  // 40-49
+	50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  // 50-59
+	60,  61,  62,  63,  64,  97,  98,  99,  100, 101, // 60-69
+	102, 103, 104, 105, 106, 107, 108, 109, 110, 111, // 70-79
+	112, 113, 114, 115, 116, 117, 118, 119, 120, 121, // 80-89
+	122, 123, 124, 125, 94,  95,  96,  97,  98,  99,  // 90-99
+	100, 101, 102, 103, 104, 105, 106, 107, 108, 109, // 100-109
+	110, 111, 112, 113, 114, 115, 116, 117, 118, 119, // 110-119
+	120, 121, 122, 123, 124, 125, 126, 127, 128, 129, // 120-129
+	130, 131, 132, 133, 134, 135, 136, 137, 138, 139, // 130-139
+	140, 141, 142, 143, 144, 145, 146, 147, 148, 149, // 140-149
+	150, 151, 152, 153, 154, 155, 156, 157, 158, 159, // 150-159
+	160, 161, 162, 163, 164, 165, 166, 167, 168, 169, // 160-169
+	170, 171, 172, 173, 174, 175, 176, 177, 178, 179, // 170-179
+	180, 181, 182, 183, 184, 185, 186, 187, 188, 189, // 180-189
+	190, 191, 192, 193, 194, 195, 196, 197, 198, 199, // 190-199
+	200, 201, 202, 203, 204, 205, 206, 207, 208, 209, // 200-209
+	210, 211, 212, 213, 214, 215, 216, 217, 218, 219, // 210-219
+	220, 221, 222, 223, 224, 225, 226, 227, 228, 229, // 220-229
+	230, 231, 232, 233, 234, 235, 236, 237, 238, 239, // 230-239
+	240, 241, 242, 243, 244, 245, 246, 247, 248, 249, // 240-249
+	250, 251, 252, 253, 254, 255,                     // 250-255
 };
 
-/** Case sensitive map.
- * Can technically also be used for ASCII case sensitive comparisons, as [ != {, etc.
+/**
+ * A case sensitive mapping of characters from upper case to lower case for the
+ * character set of RFC 1459. This is identical to ASCII.
  */
 unsigned const char rfc_case_sensitive_map[256] = {
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-        21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-        41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
-        61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
-        81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
-        101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
-        121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
-        141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
-        161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
-        181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
-        201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
-        221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240,
-        241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+	0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   // 0-9
+	10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  // 10-19
+	20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  // 20-29
+	30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  // 30-39
+	40,  41,  42,  43,  44,  45,  46,  47,  48,  49,  // 40-49
+	50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  // 50-59
+	60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  // 60-69
+	70,  71,  72,  73,  74,  75,  76,  77,  78,  79,  // 70-79
+	80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  // 80-89
+	90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  // 90-99
+	100, 101, 102, 103, 104, 105, 106, 107, 108, 109, // 100-109
+	110, 111, 112, 113, 114, 115, 116, 117, 118, 119, // 110-119
+	120, 121, 122, 123, 124, 125, 126, 127, 128, 129, // 120-129
+	130, 131, 132, 133, 134, 135, 136, 137, 138, 139, // 130-139
+	140, 141, 142, 143, 144, 145, 146, 147, 148, 149, // 140-149
+	150, 151, 152, 153, 154, 155, 156, 157, 158, 159, // 150-159
+	160, 161, 162, 163, 164, 165, 166, 167, 168, 169, // 160-169
+	170, 171, 172, 173, 174, 175, 176, 177, 178, 179, // 170-179
+	180, 181, 182, 183, 184, 185, 186, 187, 188, 189, // 180-189
+	190, 191, 192, 193, 194, 195, 196, 197, 198, 199, // 190-199
+	200, 201, 202, 203, 204, 205, 206, 207, 208, 209, // 200-209
+	210, 211, 212, 213, 214, 215, 216, 217, 218, 219, // 210-219
+	220, 221, 222, 223, 224, 225, 226, 227, 228, 229, // 220-229
+	230, 231, 232, 233, 234, 235, 236, 237, 238, 239, // 230-239
+	240, 241, 242, 243, 244, 245, 246, 247, 248, 249, // 240-249
+	250, 251, 252, 253, 254, 255,                     // 250-255
 };
 
-/* convert a string to lowercase. Note following special circumstances
- * taken from RFC 1459. Many "official" server branches still hold to this
- * rule so i will too;
- *
- *  Because of IRC's scandanavian origin, the characters {}| are
- *  considered to be the lower case equivalents of the characters []\,
- *  respectively. This is a critical issue when determining the
- *  equivalence of two nicknames.
- */
-void nspace::strlower(char *n)
+void std::tr1::strlower(char *n)
 {
 	if (n)
 	{
@@ -127,12 +163,7 @@ void nspace::strlower(char *n)
 	}
 }
 
-#ifdef HASHMAP_DEPRECATED
-	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
-
+size_t std::tr1::insensitive::operator()(const std::string &s) const
 {
 	/* XXX: NO DATA COPIES! :)
 	 * The hash function here is practically
@@ -146,7 +177,6 @@ void nspace::strlower(char *n)
 	return t;
 }
 
-
 size_t CoreExport irc::hash::operator()(const irc::string &s) const
 {
 	register size_t t = 0;
@@ -549,25 +579,3 @@ long irc::portparser::GetToken()
 		return atoi(x.c_str());
 	}
 }
-
-/*const std::basic_string& SearchAndReplace(std::string& text, const std::string& pattern, const std::string& replace)
-{
-	std::string replacement;
-	if ((!pattern.empty()) && (!text.empty()))
-	{
-		for (std::string::size_type n = 0; n != text.length(); ++n)
-		{
-			if (text.length() >= pattern.length() && text.substr(n, pattern.length()) == pattern)
-			{
-				replacement.append(replace);
-				n = n + pattern.length() - 1;
-			}
-			else
-			{
-				replacement += text[n];
-			}
-		}
-	}
-	text = replacement;
-	return text;
-}*/
diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 09df05100..339833c92 100644
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -21,9 +21,8 @@
 #include "inspircd.h"
 #include <string>
 #include <vector>
-#include "inspircd_config.h"
+#include "inspircd.h"
 #include "configreader.h"
-#include "hash_map.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 7d5ffa216..0d44cd24f 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -36,11 +36,7 @@ class SpanningTreeUtilities;
 /* This hash_map holds the hash equivalent of the server
  * tree, used for rapid linear lookups.
  */
-#ifdef HASHMAP_DEPRECATED
-	typedef nspace::hash_map<std::string, TreeServer*, nspace::insensitive, irc::StrHashComp> server_hash;
-#else
-	typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<std::string>, irc::StrHashComp> server_hash;
-#endif
+typedef std::tr1::unordered_map<std::string, TreeServer*, std::tr1::insensitive, irc::StrHashComp> server_hash;
 
 typedef std::map<TreeServer*,TreeServer*> TreeServerList;
 
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index ec38edc31..3b87ed4c3 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -97,7 +97,7 @@
  * Yes, it's horrid. Blame cl for being different. -- w00t
  */
 
-typedef nspace::hash_map<irc::string, std::deque<User*>, irc::hash> watchentries;
+typedef std::tr1::unordered_map<irc::string, std::deque<User*>, irc::hash> watchentries;
 typedef std::map<irc::string, std::string> watchlist;
 
 /* Who's watching each nickname.