diff options
Diffstat (limited to 'include/gc_alloc.h')
| -rw-r--r-- | include/gc_alloc.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/include/gc_alloc.h b/include/gc_alloc.h index 85cb7cdb..1d912db2 100644 --- a/include/gc_alloc.h +++ b/include/gc_alloc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996 by Silicon Graphics. All rights reserved. + * Copyright (c) 1996-1998 by Silicon Graphics. All rights reserved. * * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. @@ -32,6 +32,8 @@ #define GC_ALLOC_H #define __ALLOC_H // Prevent inclusion of the default version. Ugly. +#define __SGI_STL_ALLOC_H +#define __SGI_STL_INTERNAL_ALLOC_H #ifndef __ALLOC # define __ALLOC alloc @@ -304,8 +306,8 @@ class gc_alloc_template { static void * allocate(size_t n) { return GC_malloc(n); } static void * ptr_free_allocate(size_t n) { return GC_malloc_atomic(n); } - static void deallocate(void *p, size_t n) { } - static void ptr_free_deallocate(void *p, size_t n) { } + static void deallocate(void *, size_t) { } + static void ptr_free_deallocate(void *, size_t) { } }; typedef gc_alloc_template < 0 > gc_alloc; @@ -316,8 +318,8 @@ class alloc_template { static void * allocate(size_t n) { return GC_malloc_uncollectable(n); } static void * ptr_free_allocate(size_t n) { return GC_malloc_atomic_uncollectable(n); } - static void deallocate(void *p, size_t n) { GC_free(p); } - static void ptr_free_deallocate(void *p, size_t n) { GC_free(p); } + static void deallocate(void *p, size_t) { GC_free(p); } + static void ptr_free_deallocate(void *p, size_t) { GC_free(p); } }; typedef alloc_template < 0 > alloc; @@ -367,6 +369,12 @@ __GC_SPECIALIZE(unsigned, single_client_alloc) __GC_SPECIALIZE(float, single_client_alloc) __GC_SPECIALIZE(double, single_client_alloc) +#ifdef __STL_USE_STD_ALLOCATORS + +???copy stuff from stl_alloc.h or remove it to a different file ??? + +#endif /* __STL_USE_STD_ALLOCATORS */ + #endif /* _SGI_SOURCE */ #endif /* GC_ALLOC_H */ |