Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Some uint/size_t compile fixes

Browse Source 
This was SVN commit r6114.
This commit is contained in:
Simon Brenner 2008-06-26 07:25:50 +00:00
parent 4b1538bb70
commit 6e893a2050
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/network/NetLog.cpp
View File

@ -154,7 +154,7 @@ void CNetLogSink::DoBulkSink( const CNetLogEvent* pEvents, size_t eventCount )
if ( m_Closed ) return;
// Allocate new array which will store the events that will be logged
pIndices = new unsigned[ eventCount ];
pIndices = new size_t[ eventCount ];
if ( !pIndices )
{
throw std::bad_alloc();

7
source/network/NetMessage.cpp
View File

@ -137,7 +137,7 @@ const u8* CNetMessage::Deserialize( const u8* pStart, const u8* pEnd )
// Name: GetSerializedLength()
// Desc: Returns the size of the serialized message
//-----------------------------------------------------------------------------
uint CNetMessage::GetSerializedLength( void ) const
size_t CNetMessage::GetSerializedLength( void ) const
{
// By default, return header size
return ( sizeof( m_Type ) + sizeof( uint ) );
@ -920,9 +920,8 @@ CNetMessage* CNetMessage::CreateProduceMessage( const CEntityList& entities, con
// Name: CreateMessage()
// Desc: Creates the appropriate message based on the given data
//-----------------------------------------------------------------------------
CNetMessage* CNetMessageFactory::CreateMessage(
const void* pData,
uint dataSize )
CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
size_t dataSize )
{
CNetMessage* pNewMessage = NULL;
CNetMessage header;

2
source/network/NetMessage.h
View File

@ -107,7 +107,7 @@ public:
*
* @return The size of serialized message
*/
virtual uint GetSerializedLength() const;
virtual size_t GetSerializedLength() const;
/**
* Returns a string representation for the message