From c425ad9507bda6804b9e011843b9198a4016cb9c Mon Sep 17 00:00:00 2001 From: Jens Ole Wund Date: Thu, 9 Feb 2006 22:09:11 +0000 Subject: make msvc6 compile (thanks peter) so beat me if it does not work ;) --- intern/memutil/MEM_Allocator.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'intern/memutil') diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h index 40716496d16..b3a6df74ba2 100644 --- a/intern/memutil/MEM_Allocator.h +++ b/intern/memutil/MEM_Allocator.h @@ -29,6 +29,12 @@ #include "guardedalloc/MEM_guardedalloc.h" +#ifdef _MSC_VER +#if _MSC_VER < 1300 // 1200 == VC++ 6.0 according to boost +#define MS_VISUALC_6_0_WORKAROUND 1 +#endif +#endif + template struct MEM_Allocator { @@ -40,16 +46,20 @@ struct MEM_Allocator typedef const _Tp& const_reference; typedef _Tp value_type; +#ifndef MS_VISUALC_6_0_WORKAROUND template struct rebind { typedef MEM_Allocator<_Tp1> other; }; +#endif MEM_Allocator() throw() {} MEM_Allocator(const MEM_Allocator& __a) throw() {} +#ifndef MS_VISUALC_6_0_WORKAROUND template MEM_Allocator(const MEM_Allocator<_Tp1> __a) throw() { } +#endif ~MEM_Allocator() throw() {} @@ -57,6 +67,11 @@ struct MEM_Allocator const_pointer address(const_reference __x) const { return &__x; } +#ifdef MS_VISUALC_6_0_WORKAROUND + char *_Charalloc(size_type n) { + return (char *) MEM_mallocN(n, "STL MEM_Allocator VC6.0"); + } +#endif // NB: __n is permitted to be 0. The C++ standard says nothing // about what the return value is when __n == 0. _Tp* allocate(size_type __n, const void* = 0) { @@ -68,10 +83,17 @@ struct MEM_Allocator return __ret; } +#ifndef MS_VISUALC_6_0_WORKAROUND // __p is not permitted to be a null pointer. void deallocate(pointer __p, size_type){ MEM_freeN(__p); } +#else + // __p is not permitted to be a null pointer. + void deallocate(void* __p, size_type){ + MEM_freeN(__p); + } +#endif size_type max_size() const throw() { return size_t(-1) / sizeof(_Tp); -- cgit v1.2.3