beifg: Factorise code to count interference components.

[libfirm] / ir / adt / hashset.h

diff --git a/ir/adt/hashset.h b/ir/adt/hashset.h
index 4812d03..a4f35e8 100644 (file)
--- a/ir/adt/hashset.h
+++ b/ir/adt/hashset.h
@@ -1,20 +1,6 @@
 /*
- * Copyrigth (C) 1995-2007 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -22,7 +8,6 @@
  * @date    16.03.2007
  * @brief   Generic hashset functions
  * @author  Matthias Braun
- * @version $Id$
  *
  * You have to specialize this header by defining HashSet, HashSetIterator and
  * ValueType
@@ -40,7 +25,7 @@ typedef struct HashSetEntry {
 } HashSetEntry;
 #endif
 
-typedef struct HashSet {
+struct HashSet {
        HashSetEntry *entries;
        size_t num_buckets;
        size_t enlarge_threshold;
@@ -54,16 +39,18 @@ typedef struct HashSet {
 #ifdef ADDITIONAL_DATA
        ADDITIONAL_DATA
 #endif
-} HashSet;
+};
 
-typedef struct HashSetIterator {
+#ifdef HashSetIterator
+struct HashSetIterator {
        HashSetEntry *current_bucket;
        HashSetEntry *end;
 #ifndef NDEBUG
-       const HashSet *set;
+       const struct HashSet *set;
        unsigned entries_version;
 #endif
-} HashSetIterator;
+};
+#endif
 
 #ifdef DO_REHASH
 #undef HashSetEntry