From 1acceb3633c0f0c4fdf29b17d77d67c8a9b71986 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 14 Oct 2013 10:18:41 -0700
Subject: changed ll_aligned_(malloc|free) to take alignment size as a template
 argument

---
 indra/llcommon/lltrace.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/llcommon/lltrace.h')

diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h
index 325112b9b1..2f4390e4d1 100644
--- a/indra/llcommon/lltrace.h
+++ b/indra/llcommon/lltrace.h
@@ -371,40 +371,40 @@ public:
 	void* operator new(size_t size) 
 	{
 		claim_alloc(sMemStat, size);
-		return ll_aligned_malloc(ALIGNMENT, size);
+		return ll_aligned_malloc<ALIGNMENT>(size);
 	}
 
 	template<int CUSTOM_ALIGNMENT>
 	static void* aligned_new(size_t size)
 	{
 		claim_alloc(sMemStat, size);
-		return ll_aligned_malloc(CUSTOM_ALIGNMENT, size);
+		return ll_aligned_malloc<CUSTOM_ALIGNMENT>(size);
 	}
 
 	void operator delete(void* ptr, size_t size)
 	{
 		disclaim_alloc(sMemStat, size);
-		ll_aligned_free(ALIGNMENT, ptr);
+		ll_aligned_free<ALIGNMENT>(ptr);
 	}
 
 	template<int CUSTOM_ALIGNMENT>
 	static void aligned_delete(void* ptr, size_t size)
 	{
 		disclaim_alloc(sMemStat, size);
-		ll_aligned_free(CUSTOM_ALIGNMENT, ptr);
+		ll_aligned_free<CUSTOM_ALIGNMENT>(ptr);
 	}
 
 
 	void* operator new [](size_t size)
 	{
 		claim_alloc(sMemStat, size);
-		return ll_aligned_malloc(ALIGNMENT, size);
+		return ll_aligned_malloc<ALIGNMENT>(size);
 	}
 
 	void operator delete[](void* ptr, size_t size)
 	{
 		disclaim_alloc(sMemStat, size);
-		ll_aligned_free(ALIGNMENT, ptr);
+		ll_aligned_free<ALIGNMENT>(ptr);
 	}
 
 	// claim memory associated with other objects/data as our own, adding to our calculated footprint
-- 
cgit v1.2.3