Getting ready to fix compile-errors on mac. This CL only contains cosmetic…

src/compiler/PoolAlloc.cpp

@@ -152,11 +152,11 @@ const unsigned char TAllocation::guardBlockBeginVal = 0xfb;
 const unsigned char TAllocation::guardBlockEndVal   = 0xfe;
 const unsigned char TAllocation::userDataFill       = 0xcd;
 
-#   ifdef GUARD_BLOCKS
+#ifdef GUARD_BLOCKS
 	const size_t TAllocation::guardBlockSize = 16;
-#   else
+#else
 	const size_t TAllocation::guardBlockSize = 0;
-#   endif
+#endif
 
 //
 // Check a single guard block for damage

src/compiler/PoolAlloc.h

@@ -8,7 +8,7 @@
 #define _POOLALLOC_INCLUDED_
 
 #ifdef _DEBUG
-#  define GUARD_BLOCKS  // define to enable guard block sanity checking
+#define GUARD_BLOCKS  // define to enable guard block sanity checking
 #endif
 
 //
@@ -48,11 +48,11 @@ public:
         // This would be cleaner with if (guardBlockSize)..., but that
         // makes the compiler print warnings about 0 length memsets,
         // even with the if() protecting them.
-#       ifdef GUARD_BLOCKS
+#ifdef GUARD_BLOCKS
         memset(preGuard(), guardBlockBeginVal, guardBlockSize);
         memset(data(),      userDataFill,       size);
         memset(postGuard(), guardBlockEndVal,   guardBlockSize);
-#       endif
+#endif
     }
 
     void check() const {
@@ -91,11 +91,11 @@ private:
     const static unsigned char userDataFill;
 
     const static size_t guardBlockSize;
-#   ifdef GUARD_BLOCKS    
+#ifdef GUARD_BLOCKS
     inline static size_t headerSize() { return sizeof(TAllocation); }
-#   else
+#else
     inline static size_t headerSize() { return 0; }
-#   endif
+#endif
 };
 
 //
@@ -159,7 +159,8 @@ protected:
 #ifdef GUARD_BLOCKS
             lastAllocation(0),
 #endif
-		nextPage(nextPage), pageCount(pageCount) { }
+            nextPage(nextPage),
+            pageCount(pageCount) { }
 
         ~tHeader() {
 #ifdef GUARD_BLOCKS
@@ -183,11 +184,10 @@ protected:
 
     // Track allocations if and only if we're using guard blocks
     void* initializeAllocation(tHeader* block, unsigned char* memory, size_t numBytes) {
-#       ifdef GUARD_BLOCKS
+#ifdef GUARD_BLOCKS
         new(memory) TAllocation(numBytes, memory, block->lastAllocation);
         block->lastAllocation = reinterpret_cast<TAllocation*>(memory);
-#       endif
-
+#endif
         // This is optimized entirely away if GUARD_BLOCKS is not defined.
         return TAllocation::offsetAllocation(memory);
     }
@@ -242,11 +242,12 @@ class pool_allocator {
 public:
     typedef size_t size_type;
     typedef ptrdiff_t difference_type;
-	typedef T *pointer;
-	typedef const T *const_pointer;
+    typedef T* pointer;
+    typedef const T* const_pointer;
     typedef T& reference;
     typedef const T& const_reference;
     typedef T value_type;
+
     template<class Other> 
     struct rebind {
         typedef pool_allocator<Other> other;
@@ -254,48 +255,26 @@ public:
     pointer address(reference x) const { return &x; }
     const_pointer address(const_reference x) const { return &x; }
 
-#ifdef USING_SGI_STL
-	pool_allocator()  { }
-#else
     pool_allocator() : allocator(GlobalPoolAllocator) { }
     pool_allocator(TPoolAllocator& a) : allocator(a) { }
     pool_allocator(const pool_allocator<T>& p) : allocator(p.allocator) { }
-#endif
 
-#if defined(_MSC_VER) && _MSC_VER >= 1300
     template<class Other>
-#ifdef USING_SGI_STL
-		pool_allocator(const pool_allocator<Other>& p) /*: allocator(p.getAllocator())*/ { }
-#else
     pool_allocator(const pool_allocator<Other>& p) : allocator(p.getAllocator()) { }
-#endif
-#endif
 
-#ifndef _WIN32
-		template<class Other>
-			pool_allocator(const pool_allocator<Other>& p) : allocator(p.getAllocator()) { }
-#endif
-
-#ifdef USING_SGI_STL
-	static pointer allocate(size_type n) { 
-		return reinterpret_cast<pointer>(getAllocator().allocate(n)); }
-	pointer allocate(size_type n, const void*) { 
-		return reinterpret_cast<pointer>(getAllocator().allocate(n)); }
-
-	static void deallocate(void*, size_type) { }
-	static void deallocate(pointer, size_type) { }
-#else
     pointer allocate(size_type n) { 
-		return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T))); }
+        return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T)));
+    }
     pointer allocate(size_type n, const void*) { 
-		return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T))); }
+        return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T)));
+    }
 
     void deallocate(void*, size_type) { }
     void deallocate(pointer, size_type) { }
-#endif
 
     pointer _Charalloc(size_t n) {
-		return reinterpret_cast<pointer>(getAllocator().allocate(n)); }
+        return reinterpret_cast<pointer>(getAllocator().allocate(n));
+    }
 
     void construct(pointer p, const T& val) { new ((void *)p) T(val); }
     void destroy(pointer p) { p->T::~T(); }
@@ -306,16 +285,11 @@ public:
     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
 
-#ifdef USING_SGI_STL
-	//void setAllocator(TPoolAllocator* a) { allocator = a; }
-	static  TPoolAllocator& getAllocator() { return GlobalPoolAllocator; }
-#else
     void setAllocator(TPoolAllocator* a) { allocator = *a; }
     TPoolAllocator& getAllocator() const { return allocator; }
 
 protected:
     TPoolAllocator& allocator;
-#endif
 };
 
 #endif // _POOLALLOC_INCLUDED_