From 1ef151e03466a6e90f2493e24daa0db54a7b369f Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sun, 6 Jan 2013 12:25:15 +0100
Subject: [PATCH] Adjust namespace.

---
 indra/llcommon/ndallocators.h | 41 +++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/indra/llcommon/ndallocators.h b/indra/llcommon/ndallocators.h
index cf8dfb6201..5e3e04d9fd 100644
--- a/indra/llcommon/ndallocators.h
+++ b/indra/llcommon/ndallocators.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef NdAllocators_H
-#define NdAllocators_H
+#ifndef NDALLOCATORS_H
+#define NDALLOCATORS_H
 
 
 #include <new>
@@ -32,26 +32,29 @@
 #include <stdint.h>
 #include "ndmemorypool.h"
 
-namespace ndAllocators
+namespace nd
 {
+	namespace allocators
+	{
 #ifdef ND_USE_ND_ALLOCS
-void *ndMalloc( size_t aSize, size_t aAlign );
-void ndFree( void* ptr );
-void *ndRealloc( void *ptr, size_t aSize, size_t aAlign );
+		void *malloc( size_t aSize, size_t aAlign );
+		void free( void* ptr );
+		void *realloc( void *ptr, size_t aSize, size_t aAlign );
 #else
-inline void *ndMalloc( size_t aSize, size_t aAlign )
-{
-	return malloc( aSize );
-}
-inline void ndFree( void* ptr )
-{
-	return free( ptr );
-}
-void *ndRealloc( void *ptr, size_t aSize, size_t aAlign )
-{
-	return realloc( ptr, aSize );
-}
+		inline void *malloc( size_t aSize, size_t aAlign )
+		{
+			return ::malloc( aSize );
+		}
+		inline void free( void* ptr )
+		{
+			::free( ptr );
+		}
+		void *realloc( void *ptr, size_t aSize, size_t aAlign )
+		{
+			return ::realloc( ptr, aSize );
+		}
 #endif
+	}
 }
 
-#endif //NdAllocators_H
\ No newline at end of file
+#endif