summaryrefslogtreecommitdiff
path: root/indra/llmath/lloctree.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-19 18:17:18 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-19 18:17:18 -0500
commit9c2e0d84f84fe7c38b1e9f7a127efc540b43f5aa (patch)
tree0daaa88c45802db177e722d1c1eaf36cd86871c5 /indra/llmath/lloctree.h
parente62ad2bf13aa05cb19c2bd72e0d9f59117a6ec84 (diff)
SH-2789 WIP - various fixes to force 16-byte alignment
Diffstat (limited to 'indra/llmath/lloctree.h')
-rw-r--r--indra/llmath/lloctree.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 3c1ae45d68..374858be51 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -88,7 +88,7 @@ public:
typedef LLOctreeNode<T> oct_node;
typedef LLOctreeListener<T> oct_listener;
- /*void* operator new(size_t size)
+ void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
@@ -96,7 +96,7 @@ public:
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
- }*/
+ }
LLOctreeNode( const LLVector4a& center,
const LLVector4a& size,