/*
* Define some convenience macros using the predefined hash function.
*/
-#define pset_insert_ptr(set,key) pset_insert(set, key, HASH_PTR(key))
+#define pset_insert_ptr(set,key) pset_insert(set, key, HASH_PTR(key))
#define pset_hinsert_ptr(set,key) pset_hinsert(set, key, HASH_PTR(key))
-#define pset_remove_ptr(set,key) pset_remove(set, key, HASH_PTR(key))
-#define pset_find_ptr(set,key) pset_find(set, key, HASH_PTR(key))
-#define pset_new_ptr(slots) new_pset(pset_default_ptr_cmp, slots)
-#define pset_new_ptr_default() pset_new_ptr(64)
-void pset_insert_pset_ptr(pset *target, pset *src); /* Insertss all elements of src in target. */
-
+#define pset_remove_ptr(set,key) pset_remove(set, key, HASH_PTR(key))
+#define pset_find_ptr(set,key) pset_find(set, key, HASH_PTR(key))
+#define pset_new_ptr(slots) new_pset(pset_default_ptr_cmp, slots)
+#define pset_new_ptr_default() pset_new_ptr(64)
/** The entry of a pset, representing an element pointer in the set and it's meta-information */
typedef struct {
/**
* Removes an element from a pset.
*
- * @param pset the pset to insert in
- * @param key a pointer to the element to be inserted
+ * @param pset the pset to delete in
+ * @param key a pointer to the element to be deleted
* @param hash the hash-value of the element
*
* @return
*
* @remark
* The current implementation did not allow to remove non-existing elements.
+ * @@@ so, does it do now?
* Further, it is allowed to remove elements during an iteration
* including the current one.
*/
*/
void pset_break (pset *pset);
+/**
+ * Inserts all elements of the pointer set src into
+ * the set target (union).
+ *
+ * @param target the target set, will contain the union
+ * @param src a set, will not be changed
+ */
+void pset_insert_pset_ptr(pset *target, pset *src);
+
#define new_pset(cmp, slots) (PSET_TRACE (new_pset) ((cmp), (slots)))
#define pset_find(pset, key, hash) \
_pset_search ((pset), (key), (hash), _pset_find)