linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 426
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: coreupgrade
timestamp: Tue 2011-05-03 22:53:56 -0500
message:
  Move unordered_map out of tr1 namespace
modified:
  linux/downloadqueue.hh
  linux/favoriteusers.hh
  linux/hub.hh
  linux/search.hh
  linux/wulformanager.hh


--
lp:~linuxdcpp-team/linuxdcpp/coreupgrade
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/coreupgrade

Your team LinuxDC++ Team is subscribed to branch lp:~linuxdcpp-team/linuxdcpp/coreupgrade.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/coreupgrade/+edit-subscription

=== modified file 'linux/downloadqueue.hh'
--- linux/downloadqueue.hh	2010-11-03 05:24:00 +0000
+++ linux/downloadqueue.hh	2011-05-04 03:53:56 +0000
@@ -107,8 +107,8 @@
 		GtkTreeSelection *fileSelection;
 		GdkEventType dirPrevious;
 		std::string currentDir;
-		std::tr1::unordered_map<std::string, std::map<std::string, std::string> > sources;
-		std::tr1::unordered_map<std::string, std::map<std::string, std::string> > badSources;
+		std::unordered_map<std::string, std::map<std::string, std::string> > sources;
+		std::unordered_map<std::string, std::map<std::string, std::string> > badSources;
 		int currentItems;
 		int totalItems;
 		int64_t currentSize;

=== modified file 'linux/favoriteusers.hh'
--- linux/favoriteusers.hh	2010-05-25 06:12:37 +0000
+++ linux/favoriteusers.hh	2011-05-04 03:53:56 +0000
@@ -40,7 +40,7 @@
 
 	private:
 		typedef std::map<std::string, std::string> ParamMap;
-		typedef std::tr1::unordered_map<std::string, GtkTreeIter> UserIters;
+		typedef std::unordered_map<std::string, GtkTreeIter> UserIters;
 
 		// GUI functions
 		bool findUser_gui(const std::string &cid, GtkTreeIter *iter);

=== modified file 'linux/hub.hh'
--- linux/hub.hh	2010-11-10 07:07:40 +0000
+++ linux/hub.hh	2011-05-04 03:53:56 +0000
@@ -124,8 +124,8 @@
 		virtual void on(dcpp::ClientListener::NickTaken, dcpp::Client *) throw();
 		virtual void on(dcpp::ClientListener::SearchFlood, dcpp::Client *, const std::string &message) throw();
 
-		std::tr1::unordered_map<std::string, std::string> userMap;
-		std::tr1::unordered_map<std::string, GtkTreeIter> userIters;
+		std::unordered_map<std::string, std::string> userMap;
+		std::unordered_map<std::string, GtkTreeIter> userIters;
 		std::string completionKey;
 		dcpp::Client *client;
 		TreeView nickView;

=== modified file 'linux/search.hh'
--- linux/search.hh	2010-11-12 08:07:06 +0000
+++ linux/search.hh	2011-05-04 03:53:56 +0000
@@ -142,7 +142,7 @@
 		bool onlyFree;
 		UserCommandMenu *userCommandMenu;
 		GroupType previousGrouping;
-		std::tr1::unordered_map<std::string, std::vector<dcpp::SearchResultPtr> > results;
+		std::unordered_map<std::string, std::vector<dcpp::SearchResultPtr> > results;
 };
 
 #else

=== modified file 'linux/wulformanager.hh'
--- linux/wulformanager.hh	2008-11-30 20:15:23 +0000
+++ linux/wulformanager.hh	2011-05-04 03:53:56 +0000
@@ -71,7 +71,7 @@
 		std::string path;
 		std::vector<FuncBase *> guiFuncs;
 		std::vector<FuncBase *> clientFuncs;
-		std::tr1::unordered_map<std::string, Entry *> entries;
+		std::unordered_map<std::string, Entry *> entries;
 		gint guiCondValue;
 		gint clientCondValue;
 		GCond *guiCond;