TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency

Browse source 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
This commit is contained in:
Daniel Buckmaster 2014-04-04 13:43:25 +11:00
commit 87d9e245b7
210 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/platform/platformMemory.cpp
View file

@ -367,7 +367,7 @@ static U32 validateTreeRecurse(TreeNode *tree)
if(tree == NIL)
return 1;
// check my left tree
int lcount, rcount, nc = 0;
S32 lcount, rcount, nc = 0;
if(tree->color == Red)
{
@ -1586,7 +1586,7 @@ dsize_t getMemoryUsed()
}
#ifdef TORQUE_DEBUG_GUARD
DefineEngineFunction( dumpAlloc, void, ( int allocNum ),,
DefineEngineFunction( dumpAlloc, void, ( S32 allocNum ),,
"@brief Dumps information about the given allocated memory block.\n\n"
"@param allocNum Memory block to dump information about."
"@note Available in debug builds only. "