From 95b496c831e86c8ba57223bd69aa33a2f1bb9f88 Mon Sep 17 00:00:00 2001
From: Daniel De Graaf
Date: Sun, 22 Aug 2010 12:42:59 -0400
Subject: Remove "assign()" converter between irc::string and std::string

---
 src/configreader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/configreader.cpp')

diff --git a/src/configreader.cpp b/src/configreader.cpp
index a419a6d16..6dd130e76 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -461,11 +461,11 @@ void ServerConfig::Fill()
 		throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
 
 	std::string defbind = options->getString("defaultbind");
-	if (assign(defbind) == "ipv4")
+	if (irc::string(defbind) == "ipv4")
 	{
 		WildcardIPv6 = false;
 	}
-	else if (assign(defbind) == "ipv6")
+	else if (irc::string(defbind) == "ipv6")
 	{
 		WildcardIPv6 = true;
 	}
@@ -485,7 +485,7 @@ void ServerConfig::Fill()
 		std::string server;
 		if (!tag->readString("server", server))
 			throw CoreException("<uline> tag missing server at " + tag->getTagLocation());
-		ulines[assign(server)] = tag->getBool("silent");
+		ulines.insert(std::make_pair(server, tag->getBool("silent")));
 	}
 
 	tags = GetTags("banlist");
-- 
cgit v1.3.1-10-gc9f91