this is a more "clean" conversion to 64 bit than the type-fixups branch, which does borrow some elements from it but has far less find and replace...it is about 98-99% done, notes to follow later

This commit is contained in:
DarthArgus
2017-01-24 03:35:59 +00:00
parent 42b949c3dc
commit 36686348e9
458 changed files with 2282 additions and 2367 deletions
@@ -237,7 +237,7 @@ void CTSAPIClient::onRequestDestinationServerList(const unsigned server_track, c
//-----------------------------------------------------------------------
void CTSAPIClient::onConnect(const char *host, const short port, const short current, const short max)
void CTSAPIClient::onConnect(const char *host, const int16_t port, const int16_t current, const int16_t max)
{
LOG("CTSAPI", ("CTSAPIClient::onConnect(%s, %d, %d, %d)", host, port, current, max));
REPORT_LOG(true, ("CTSAPIClient::onConnect(%s, %d, %d, %d)\n", host, port, current, max));
@@ -246,7 +246,7 @@ void CTSAPIClient::onConnect(const char *host, const short port, const short cur
//-----------------------------------------------------------------------
void CTSAPIClient::onDisconnect(const char *host, const short port, const short current, const short max)
void CTSAPIClient::onDisconnect(const char *host, const int16_t port, const int16_t current, const int16_t max)
{
LOG("CTSAPI", ("CTSAPIClient::onDisconnect(%s, %d, %d, %d)", host, port, current, max));
REPORT_LOG(true, ("CTSAPIClient::onDisconnect(%s, %d, %d, %d)\n", host, port, current, max));
@@ -18,8 +18,8 @@ public:
CTSAPIClient(const std::string & hostName, const std::string & game);
virtual ~CTSAPIClient();
virtual void onConnect(const char *host, const short port, const short current, const short max);
virtual void onDisconnect(const char *host, const short port, const short current, const short max);
virtual void onConnect(const char *host, const int16_t port, const int16_t current, const int16_t max);
virtual void onDisconnect(const char *host, const int16_t port, const int16_t current, const int16_t max);
// ----- Normal Callbacks as a response to requests sent -----
@@ -94,9 +94,9 @@ void ConfigTransferServer::remove(void)
//-----------------------------------------------------------------------
unsigned short ConfigTransferServer::getCentralServerServiceBindPort()
uint16_t ConfigTransferServer::getCentralServerServiceBindPort()
{
return static_cast<unsigned short>(data->centralServerServiceBindPort);
return static_cast<uint16_t>(data->centralServerServiceBindPort);
}
//-----------------------------------------------------------------------