linuxdcpp-team team mailing list archive

Thread
Date

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 3155: fix GCC build (4.7 lacks some emplace functions)

To: LinuxDC++ Team <linuxdcpp-team@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 13 Dec 2012 18:06:12 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3155
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2012-12-13 19:05:50 +0100
message:
  fix GCC build (4.7 lacks some emplace functions)
modified:
  dcpp/ShareManager.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/ShareManager.cpp'
--- dcpp/ShareManager.cpp	2012-12-13 17:04:31 +0000
+++ dcpp/ShareManager.cpp	2012-12-13 18:05:50 +0000
@@ -357,7 +357,7 @@
 
 			const string& virtualName = aXml.getChildAttrib("Virtual");
 			string vName = validateVirtual(virtualName.empty() ? Util::getLastDir(realPath) : virtualName);
-			shares.emplace(realPath, vName);
+			shares[move(realPath)] = vName;
 			if(getByVirtual(vName) == directories.end()) {
 				directories.push_back(Directory::create(vName));
 			}
@@ -495,7 +495,7 @@
 	{
 		Lock l(cs);
 
-		shares.emplace(realPath, vName);
+		shares[realPath] = move(vName);
 		updateIndices(*merge(dp, realPath));
 
 		setDirty();