X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Frculfhash.h;h=0496662e209c250f0e11ea1e83cecd25eaa06eae;hb=969143888baf25e15bbba7f5dec78479be3588b2;hp=2938e5ec6235883acc9efb9b029e135035f7a10e;hpb=7b783f818175cd92d98f78e761331f306ff406a5;p=urcu.git

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 2938e5e..0496662 100644
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -175,6 +175,8 @@ struct cds_lfht *cds_lfht_new(unsigned long init_size,
  *
  * Return 0 on success, negative error value on error.
  * Threads calling this API need to be registered RCU read-side threads.
+ * cds_lfht_destroy should *not* be called from a RCU read-side critical
+ * section.
  */
 int cds_lfht_destroy(struct cds_lfht *ht, pthread_attr_t **attr);
 
@@ -450,21 +452,21 @@ void cds_lfht_resize(struct cds_lfht *ht, unsigned long new_size);
 #define cds_lfht_for_each_entry(ht, iter, pos, member)			\
 	for (cds_lfht_first(ht, iter),					\
 			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
-					typeof(*(pos)), member);	\
+					__typeof__(*(pos)), member);	\
 		&(pos)->member != NULL;					\
 		cds_lfht_next(ht, iter),				\
 			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
-					typeof(*(pos)), member))
+					__typeof__(*(pos)), member))
 
 #define cds_lfht_for_each_entry_duplicate(ht, hash, match, key,		\
 				iter, pos, member)			\
 	for (cds_lfht_lookup(ht, hash, match, key, iter),		\
 			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
-					typeof(*(pos)), member);	\
+					__typeof__(*(pos)), member);	\
 		&(pos)->member != NULL;					\
 		cds_lfht_next_duplicate(ht, match, key, iter),		\
 			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
-					typeof(*(pos)), member))
+					__typeof__(*(pos)), member))
 
 #ifdef __cplusplus
 }