diff options
| author | DJ Delorie <dj@redhat.com> | 2010-06-10 22:30:17 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2010-06-10 22:30:17 +0400 |
| commit | 1512fa491e9456365193801564985a5420aadb52 (patch) | |
| tree | 325a851786dac04a3dd8a35a06d6e25df5c28bce /include/splay-tree.h | |
| parent | e0a451aef917c3944b41b209ef971468415d8518 (diff) | |
merge from gcc
Diffstat (limited to 'include/splay-tree.h')
| -rw-r--r-- | include/splay-tree.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/splay-tree.h b/include/splay-tree.h index 57a96c4a3..480b2c43e 100644 --- a/include/splay-tree.h +++ b/include/splay-tree.h @@ -1,5 +1,5 @@ /* A splay-tree datatype. - Copyright 1998, 1999, 2000, 2002, 2005, 2007, 2009 + Copyright 1998, 1999, 2000, 2002, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. Contributed by Mark Mitchell (mark@markmitchell.com). @@ -119,9 +119,13 @@ struct GTY(()) splay_tree_s { /* The deallocate-value function. NULL if no cleanup is necessary. */ splay_tree_delete_value_fn delete_value; - /* Allocate/free functions, and a data pointer to pass to them. */ + /* Node allocate function. Takes allocate_data as a parameter. */ splay_tree_allocate_fn allocate; + + /* Free function for nodes and trees. Takes allocate_data as a parameter. */ splay_tree_deallocate_fn deallocate; + + /* Parameter for allocate/free functions. */ void * GTY((skip)) allocate_data; }; @@ -136,6 +140,13 @@ extern splay_tree splay_tree_new_with_allocator (splay_tree_compare_fn, splay_tree_allocate_fn, splay_tree_deallocate_fn, void *); +extern splay_tree splay_tree_new_typed_alloc (splay_tree_compare_fn, + splay_tree_delete_key_fn, + splay_tree_delete_value_fn, + splay_tree_allocate_fn, + splay_tree_allocate_fn, + splay_tree_deallocate_fn, + void *); extern void splay_tree_delete (splay_tree); extern splay_tree_node splay_tree_insert (splay_tree, splay_tree_key, |