------------------------------------------------------------
revno: 3155
committer: poy <p...@123gen.com>
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();
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
