Minor fixes including removing <> from make_pair usage and using explicit conversions where required by the explicit constructor flags

Now builds/runs using c++11
This commit is contained in:
Anonymous
2014-01-23 08:55:46 -07:00
parent fabe85739d
commit e6431a9fd4
14 changed files with 34 additions and 49 deletions
@@ -168,12 +168,12 @@ void CentralServerConnection::onReceive(const Archive::ByteStream & message)
// return an appropriate response.
if( object && object->isAuthoritative() )
{
GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair< unsigned int, bool >( msg.getValue().second, true ) );
GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair( msg.getValue().second, true ) );
GameServer::getInstance().sendToCentralServer( rmsg );
}
else
{
GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair< unsigned int, bool >( msg.getValue().second, false ) );
GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair( msg.getValue().second, false ) );
GameServer::getInstance().sendToCentralServer( rmsg );
}
}