X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Flibfirm%2Fadt%2Fset.h;h=828dadd5c7743e223e0ab1dfdfa5d1a812343dc3;hb=13bb23b1b6c8353b0ca15c13ef70d56d44f4f3c3;hp=b9f9617a4d68705e2d7f2333c15e966ea9059018;hpb=74d5a9023b48f346eead323a74e28297659e34b7;p=libfirm

diff --git a/include/libfirm/adt/set.h b/include/libfirm/adt/set.h
index b9f9617a4..828dadd5c 100644
--- a/include/libfirm/adt/set.h
+++ b/include/libfirm/adt/set.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -75,7 +75,7 @@ typedef int (*set_cmp_fun) (const void *elt, const void *key, size_t size);
  * @returns
  *    created set
  */
-FIRM_API set *new_set(set_cmp_fun func, int slots);
+FIRM_API set *new_set(set_cmp_fun func, size_t slots);
 
 /**
  * Deletes a set and all elements of it.
@@ -89,7 +89,7 @@ FIRM_API void del_set(set *set);
  *
  * @param set   the set
  */
-FIRM_API int set_count(set *set);
+FIRM_API size_t set_count(set *set);
 
 /**
  * Searches an element in a set.
@@ -189,10 +189,10 @@ FIRM_API void set_break(set *set);
  * @param set    the set
  * @param entry  the iterator
  */
-#define foreach_set(set, entry) for (entry = set_first(set); entry; entry = set_next(set))
+#define foreach_set(set, type, entry) for (entry = (type) set_first(set); entry; entry = (type) set_next(set))
 
 /* implementation specific */
-#define new_set(cmp, slots) (SET_TRACE (new_set) ((cmp), (slots)))
+#define new_set(cmp, slots) ((new_set) ((cmp), (slots)))
 #define set_find(set, key, size, hash) \
   _set_search ((set), (key), (size), (hash), _set_find)
 #define set_insert(set, key, size, hash) \
@@ -225,7 +225,7 @@ void set_stats (set *set);
  *
  * @param set  the set
  */
-FIRM_API void set_describe (set *set);
+FIRM_API void set_describe(set *set);
 #endif
 
 
@@ -235,17 +235,6 @@ typedef enum { _set_find, _set_insert, _set_hinsert, _set_hinsert0 } _set_action
 
 FIRM_API void *_set_search(set *, const void *, size_t, unsigned, _set_action);
 
-#if defined(DEBUG) && defined(HAVE_GNU_MALLOC)
-extern const char *set_tag;
-# ifdef SET_ID
-#   define SET_TRACE set_tag = SET_ID,
-# else
-#   define SET_TRACE set_tag = __FILE__,
-# endif
-#else /* !(DEBUG && HAVE_GNU_MALLOC) */
-#   define SET_TRACE
-#endif /* !(DEBUG && HAVE_GNU_MALLOC) */
-
 #include "../end.h"
 
 #endif