swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-04 19:13:06 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp
Vendored
+8 -8
View File
@@ -87,8 +87,8 @@ void CConnectionHandler::OnTerminated(UdpConnection *)
void CConnectionHandler::OnRoutePacket(UdpConnection *, const uchar *data, int dataLen)
{
unsigned short itemCount;
unsigned short messageId = 0;
uint16_t itemCount;
uint16_t messageId = 0;
unsigned trackingNumber = 0;
if (dataLen < 8)
@@ -518,12 +518,12 @@ void apiCore::OnConnectionFailed(const std::string & address, unsigned connectio
mParent->OnConnectionFailed(address.c_str(),connectionCount);
}
bool apiCore::IsTrackedMessage(const unsigned short messageId)
bool apiCore::IsTrackedMessage(const uint16_t messageId)
{
return mTrackedMessages.find(messageId) != mTrackedMessages.end();
}
void apiCore::RegisterTrackedMessage(const unsigned short messageId)
void apiCore::RegisterTrackedMessage(const uint16_t messageId)
{
mTrackedMessages.insert(messageId);
}
@@ -674,8 +674,8 @@ void apiCore::Process()
// Process Tracked Callback Queue
while (!mTrackedCallbackQueue.empty())
{
unsigned short itemCount;
unsigned short messageId = 0;
uint16_t itemCount;
uint16_t messageId = 0;
Base::ByteStream & stream = mTrackedCallbackQueue.front();
Base::ByteStream::ReadIterator streamIterator = stream.begin();
@@ -712,7 +712,7 @@ void apiCore::Process()
const int DEFAULT_TIMEOUT = 20;
apiTrackedRequest::apiTrackedRequest(apiTrackingNumber trackingNumber, const unsigned short messageId, const void * userData, unsigned duration) :
apiTrackedRequest::apiTrackedRequest(apiTrackingNumber trackingNumber, const uint16_t messageId, const void * userData, unsigned duration) :
mTrackingNumber(trackingNumber),
mMessageId(messageId),
mUserData(userData),
@@ -743,7 +743,7 @@ apiTrackingNumber apiTrackedRequest::GetTrackingNumber()
return mTrackingNumber;
}
unsigned short apiTrackedRequest::GetMessageId()
uint16_t apiTrackedRequest::GetMessageId()
{
return mMessageId;
}