X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnodeset.c;h=80417fb2ab7fc60308d677b3e96d94a13bb9cb4f;hb=69d11aa49aa17358468bbb2f5506ef5f009514e9;hp=d6ccb557dd897ee0a0118d4374a009db88314df3;hpb=f97fd9ebeff21c0457c415c5c57708e4807d8919;p=libfirm

diff --git a/ir/ir/irnodeset.c b/ir/ir/irnodeset.c
index d6ccb557d..80417fb2a 100644
--- a/ir/ir/irnodeset.c
+++ b/ir/ir/irnodeset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -38,14 +38,9 @@
 #define ValueType                 ir_node*
 #define NullValue                 NULL
 #define DeletedValue              ((ir_node*)-1)
-#ifdef DEBUG_libfirm
 #define Hash(this,key)            ((unsigned)((key)->node_nr))
-#else
-#define Hash(this,key)            HASH_PTR(key)
-#endif
 #define KeysEqual(this,key1,key2) (key1) == (key2)
 #define SetRangeEmpty(ptr,size)   memset(ptr, 0, (size) * sizeof((ptr)[0]))
-#define ValueCmp(a,b)             ((int) get_irn_idx(a) - (int) get_irn_idx(b))
 
 #define hashset_init            _ir_nodeset_init
 #define hashset_init_size       ir_nodeset_init_size
@@ -58,19 +53,8 @@
 #define hashset_iterator_next   ir_nodeset_iterator_next
 #define hashset_remove_iterator ir_nodeset_remove_iterator
 
-#ifdef IR_NODESET_USE_ORDERED_SETS
-
-#define hashset_insert_quick    ir_nodeset_insert_quick
-#define hashset_remove_quick    ir_nodeset_remove_quick
-#define hashset_fixup           ir_nodeset_fixup
-#include "arrayset.c"
-
-#else
-
 #include "hashset.c"
 
-#endif /* IR_NODESET_USE_ORDERED_SETS */
-
 void ir_nodeset_init(ir_nodeset_t *nodeset)
 {
 	ir_nodeset_init_size(nodeset, 16);
@@ -78,5 +62,5 @@ void ir_nodeset_init(ir_nodeset_t *nodeset)
 
 int ir_nodeset_contains(const ir_nodeset_t *nodeset, const ir_node *node)
 {
-	return _ir_nodeset_find(nodeset, node) != NULL;
+	return _ir_nodeset_find(nodeset, node);
 }