From 057536bd73db72485950605b32f9cfbde98988b3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 20 Nov 2012 22:25:10 -0800 Subject: [PATCH] rbtree-list, rbtreehash-list: no 'static inline' * lib/gl_anyrbtree_list2.h (rotate_left, rotate_right): * lib/gl_anytree_list2.h (node_at): * lib/gl_anytreehash_list1.h (hash_resize_after_add) (gl_oset_first, add_nodes_to_buckets): Now static, not static inline. --- ChangeLog | 7 +++++++ lib/gl_anyrbtree_list2.h | 4 ++-- lib/gl_anytree_list2.h | 2 +- lib/gl_anytreehash_list1.h | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d2fce3de..59936b42c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-11-29 Paul Eggert + rbtree-list, rbtreehash-list: no 'static inline' + * lib/gl_anyrbtree_list2.h (rotate_left, rotate_right): + * lib/gl_anytree_list2.h (node_at): + * lib/gl_anytreehash_list1.h (hash_resize_after_add) + (gl_oset_first, add_nodes_to_buckets): + Now static, not static inline. + regex: no 'static inline' * lib/regex_internal.c (calc_state_hash): * lib/regex_internal.h (bitset_set, bitset_clear, bitset_contain) diff --git a/lib/gl_anyrbtree_list2.h b/lib/gl_anyrbtree_list2.h index 27daa2222..e46852aa3 100644 --- a/lib/gl_anyrbtree_list2.h +++ b/lib/gl_anyrbtree_list2.h @@ -163,7 +163,7 @@ gl_tree_nx_create (gl_list_implementation_t implementation, Change the tree structure, update the branch sizes. The caller must update the colors and register D as child of its parent. */ -static inline gl_list_node_t +static gl_list_node_t rotate_left (gl_list_node_t b_node, gl_list_node_t d_node) { gl_list_node_t a_node = b_node->left; @@ -197,7 +197,7 @@ rotate_left (gl_list_node_t b_node, gl_list_node_t d_node) Change the tree structure, update the branch sizes. The caller must update the colors and register B as child of its parent. */ -static inline gl_list_node_t +static gl_list_node_t rotate_right (gl_list_node_t b_node, gl_list_node_t d_node) { gl_list_node_t a_node = b_node->left; diff --git a/lib/gl_anytree_list2.h b/lib/gl_anytree_list2.h index d0301bf83..8d8b9775b 100644 --- a/lib/gl_anytree_list2.h +++ b/lib/gl_anytree_list2.h @@ -137,7 +137,7 @@ gl_tree_previous_node (gl_list_t list, gl_list_node_t node) } /* Return the node at the given position < gl_tree_size (list). */ -static inline gl_list_node_t +static gl_list_node_t node_at (gl_list_node_t root, size_t position) { /* Here we know that root != NULL. */ diff --git a/lib/gl_anytreehash_list1.h b/lib/gl_anytreehash_list1.h index 148b056d4..5f9e77b01 100644 --- a/lib/gl_anytreehash_list1.h +++ b/lib/gl_anytreehash_list1.h @@ -29,7 +29,7 @@ struct gl_multiple_nodes #define MULTIPLE_NODES_MAGIC (void *) -1 /* Resize the hash table if needed, after list->count was incremented. */ -static inline void +static void hash_resize_after_add (gl_list_t list) { size_t count = (list->root != 0 ? list->root->branch_size : 0); @@ -87,7 +87,7 @@ compare_position_threshold (const void *x, const void *threshold) } /* Return the first element of a non-empty ordered set of nodes. */ -static inline gl_list_node_t +static gl_list_node_t gl_oset_first (gl_oset_t set) { gl_oset_iterator_t iter = gl_oset_iterator (set); @@ -272,7 +272,7 @@ remove_from_bucket (gl_list_t list, gl_list_node_t old_node) /* Build up the hash table during initialization: Store all the nodes of list->root in the hash table. Return 0 upon success, -1 upon out-of-memory. */ -static inline int +static int add_nodes_to_buckets (gl_list_t list) { /* Iterate across all nodes. */ -- 2.11.0