livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Post-Merge sweep. Remove operator new/delete.

Nicky 2014-06-10 16:10:10 +02:00
parent eebe42abc5
commit 6128f59788
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llviewerpartsim.cpp
View File

@ -41,8 +41,6 @@
#include "llspatialpartition.h"
#include "llvovolume.h"
#include "nd/ndobjectpool.h" // <FS:ND/> For operator new/delete
const F32 PART_SIM_BOX_SIDE = 16.f;
const F32 PART_SIM_BOX_OFFSET = 0.5f*PART_SIM_BOX_SIDE;
const F32 PART_SIM_BOX_RAD = 0.5f*F_SQRT3*PART_SIM_BOX_SIDE;
@ -894,20 +892,3 @@ void LLViewerPartSim::clearParticlesByOwnerID(const LLUUID& task_id)
}
}
// <FS:ND> Object pool for LLViewerPart
// Assume this is singlethreaded (nd::locks::NoLock) 16 byte aligned and allocate 128 objects per chunk
nd::objectpool::ObjectPool< LLViewerPart, nd::locks::NoLock, 16, 128 > sViewerpartPool;
void* LLViewerPart::operator new(size_t size)
{
llassert_always( size == sizeof(LLViewerPart) );
return sViewerpartPool.allocMemoryForObject();
}
void LLViewerPart::operator delete(void* ptr)
{
sViewerpartPool.freeMemoryOfObject( ptr );
}
// </FS:ND>

5
indra/newview/llviewerpartsim.h
View File

@ -81,11 +81,6 @@ public:
static U32 sNextPartID;
// <FS:ND> Object pool for LLViewerPart
void* operator new(size_t size);
void operator delete(void* ptr);
// </FS:ND>
};