update against 03-Feb-2005 release

1 files changed, 11 insertions, 10 deletions

diff --git a/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp b/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp
index 7cb83b9bd0..497264348b 100755
--- a/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp
+++ b/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp
@@ -1,5 +1,5 @@
 //

-//Copyright (C) 2002-2004  3Dlabs Inc. Ltd.

+//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.

 //All rights reserved.

 //

 //Redistribution and use in source and binary forms, with or without

@@ -34,7 +34,6 @@
 

 #include "../Include/PoolAlloc.h"

 #include "../Include/Common.h"

-#include <assert.h>

 

 #include "Include/InitializeGlobals.h"

 #include "osinclude.h"

@@ -52,7 +51,6 @@ void InitializeGlobalPools()
     TThreadGlobalPools* threadData = new TThreadGlobalPools();

     

     threadData->globalPoolAllocator = globalPoolAllocator;

-    threadData->compilerPoolAllocator = 0;

     	

     OS_SetTLSValue(PoolIndex, threadData);     

 	globalPoolAllocator->push();

@@ -99,13 +97,6 @@ void SetGlobalPoolAllocatorPtr(TPoolAllocator* poolAllocator)
     threadData->globalPoolAllocator = poolAllocator;

 }

 

-PoolAllocatorPointer& GetCompilerPoolAllocator()

-{

-    TThreadGlobalPools* threadData = static_cast<TThreadGlobalPools*>(OS_GetTLSValue(PoolIndex));

-

-    return threadData->compilerPoolAllocator;

-}

-

 //

 // Implement the functionality of the TPoolAllocator class, which

 // is documented in PoolAlloc.h.

@@ -191,6 +182,16 @@ TPoolAllocator::~TPoolAllocator()
     }

 }

 

+// Support MSVC++ 6.0

+const unsigned char TAllocation::guardBlockBeginVal = 0xfb;

+const unsigned char TAllocation::guardBlockEndVal   = 0xfe;

+const unsigned char TAllocation::userDataFill       = 0xcd;

+

+#   ifdef GUARD_BLOCKS

+    const size_t TAllocation::guardBlockSize = 16;

+#   else

+    const size_t TAllocation::guardBlockSize = 0;

+#   endif

 

 //

 // Check a single guard block for damage