From 04b7648e004a5f21c615aa36c0801ae0986baf1e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 18 Jan 2014 13:53:29 +0100 Subject: db/upnp/Device: use ContentDirectoryDescriptor's move operator Reduce bloat. --- src/db/upnp/Discovery.cxx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/db/upnp/Discovery.cxx') diff --git a/src/db/upnp/Discovery.cxx b/src/db/upnp/Discovery.cxx index 98bc8ddb2..b5c6b5f92 100644 --- a/src/db/upnp/Discovery.cxx +++ b/src/db/upnp/Discovery.cxx @@ -82,13 +82,7 @@ UPnPDeviceDirectory::discoExplorer() } const ScopeLock protect(mutex); -#if defined(__clang__) || GCC_CHECK_VERSION(4,8) - auto e = directories.emplace(tsk->deviceId, d); -#else - auto e = directories.insert(std::make_pair(tsk->deviceId, d)); -#endif - if (!e.second) - e.first->second = d; + directories[std::move(tsk->deviceId)] = std::move(d); delete tsk; } -- cgit v1.2.3