games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

remove no longer needed adjustments

Browse Source
This commit is contained in:
Andrey Filipenkov
2022-08-15 12:18:52 +03:00
parent 5b50d69db1
commit 35e1b86683
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/filesystem/AdapterLoaders.cpp
View File

@@ -156,9 +156,7 @@ std::vector<const ISimpleResourceLoader *> CFilesystemList::getResourcesWithName
std::vector<const ISimpleResourceLoader *> ret; std::vector<const ISimpleResourceLoader *> ret;
for (auto & loader : loaders) for (auto & loader : loaders)
// todo ios boost::range::copy(loader->getResourcesWithName(resourceName), std::back_inserter(ret));
if (loader)
boost::range::copy(loader->getResourcesWithName(resourceName), std::back_inserter(ret));
return ret; return ret;
} }

3
lib/serializer/Connection.cpp
View File

@@ -73,8 +73,7 @@ CConnection::CConnection(std::string host, ui16 port, std::string Name, std::str
boost::system::error_code error = asio::error::host_not_found; boost::system::error_code error = asio::error::host_not_found;
socket = std::make_shared<tcp::socket>(*io_service); socket = std::make_shared<tcp::socket>(*io_service);
tcp::resolver resolver(*io_service); tcp::resolver resolver(*io_service);
// todo ios: is new param really needed? tcp::resolver::iterator end, pom, endpoint_iterator = resolver.resolve(tcp::resolver::query(host, std::to_string(port)),error);
tcp::resolver::iterator end, pom, endpoint_iterator = resolver.resolve(tcp::resolver::query(host, std::to_string(port), resolver_query_base::numeric_service), error);
if(error) if(error)
{ {
logNetwork->error("Problem with resolving: \n%s", error.message()); logNetwork->error("Problem with resolving: \n%s", error.message());