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

Refactoring: avoid using namespace when it's not absolutely needed

Browse Source
This commit is contained in:
Arseniy Shestakov
2015-12-29 02:14:08 +03:00
parent 6985e96f0d
commit 29a7934a99
7 changed files with 66 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/CVCMIServer.cpp
View File

@@ -38,9 +38,6 @@
std::string NAME_AFFIX = "server";
std::string NAME = GameConstants::VCMI_VERSION + std::string(" (") + NAME_AFFIX + ')'; //application name
using namespace boost;
using namespace boost::asio;
using namespace boost::asio::ip;
#ifndef VCMI_ANDROID
namespace intpr = boost::interprocess;
#endif
@@ -59,7 +56,7 @@ boost::program_options::variables_map cmdLineOptions;
*
*/
static void vaccept(tcp::acceptor *ac, tcp::socket *s, boost::system::error_code *error)
static void vaccept(boost::asio::ip::tcp::acceptor *ac, boost::asio::ip::tcp::socket *s, boost::system::error_code *error)
{
ac->accept(*s,*error);
}
@@ -314,7 +311,7 @@ void CPregameServer::startListeningThread(CConnection * pc)
}
CVCMIServer::CVCMIServer()
: io(new boost::asio::io_service()), acceptor(new TAcceptor(*io, tcp::endpoint(tcp::v4(), port))), firstConnection(nullptr)
: io(new boost::asio::io_service()), acceptor(new TAcceptor(*io, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port))), firstConnection(nullptr)
{
logNetwork->debugStream() << "CVCMIServer created!";
}
@@ -414,7 +411,7 @@ void CVCMIServer::start()
boost::system::error_code error;
logNetwork->infoStream()<<"Listening for connections at port " << acceptor->local_endpoint().port();
auto s = new tcp::socket(acceptor->get_io_service());
auto s = new boost::asio::ip::tcp::socket(acceptor->get_io_service());
boost::thread acc(std::bind(vaccept,acceptor,s,&error));
#ifndef VCMI_ANDROID
sr->setToTrueAndNotify();
@@ -499,7 +496,7 @@ void CVCMIServer::loadGame()
}
else
{
auto s = new tcp::socket(acceptor->get_io_service());
auto s = new boost::asio::ip::tcp::socket(acceptor->get_io_service());
acceptor->accept(*s,error);
if(error) //retry
{
@@ -610,7 +607,7 @@ int main(int argc, char** argv)
srand ( (ui32)time(nullptr) );
try
{
io_service io_service;
boost::asio::io_service io_service;
CVCMIServer server;
try