64-bit mingw port: In hash table routines, use 'intptr_t' instead of 'long'.

[cln.git] / src / base / hash / cl_rcpointer2_hashweak_rcpointer.cc

diff --git a/src/base/hash/cl_rcpointer2_hashweak_rcpointer.cc b/src/base/hash/cl_rcpointer2_hashweak_rcpointer.cc
index cd3ef247c1410b648a3f415d919d6a6fd5aeb855..4d6d0f2b693498bc72b99096a5346b0ac3cd0e0a 100644 (file)
--- a/src/base/hash/cl_rcpointer2_hashweak_rcpointer.cc
+++ b/src/base/hash/cl_rcpointer2_hashweak_rcpointer.cc
@@ -1,25 +1,21 @@
 // class cl_wht_from_rcpointer2_to_rcpointer.
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
-#include "cl_rcpointer2_hashweak_rcpointer.h"
+#include "base/hash/cl_rcpointer2_hashweak_rcpointer.h"
 
 
 // Implementation.
 
-#include "cl_hash2weak.h"
+#include "base/hash/cl_hash2weak.h"
 
 namespace cln {
 
 static void cl_weak_hashtable_from_rcpointer2_to_rcpointer_destructor (cl_heap* pointer)
 {
-#if (defined(__mips__) || defined(__mips64__)) && !defined(__GNUC__) // workaround SGI CC bug
-       (*(cl_heap_weak_hashtable_from_rcpointer2_to_rcpointer*)pointer).~cl_heap_weak_hashtable_2();
-#else
        (*(cl_heap_weak_hashtable_from_rcpointer2_to_rcpointer*)pointer).~cl_heap_weak_hashtable_from_rcpointer2_to_rcpointer();
-#endif
 }
 
 cl_class cl_class_weak_hashtable_from_rcpointer2_to_rcpointer = {
@@ -29,7 +25,7 @@ cl_class cl_class_weak_hashtable_from_rcpointer2_to_rcpointer = {
 
 // These are not inline, because they tend to duplicate a lot of template code.
 
-cl_wht_from_rcpointer2_to_rcpointer::cl_wht_from_rcpointer2_to_rcpointer (cl_boolean (*maygc_htentry) (const cl_htentry_from_rcpointer2_to_rcpointer&))
+cl_wht_from_rcpointer2_to_rcpointer::cl_wht_from_rcpointer2_to_rcpointer (bool (*maygc_htentry) (const cl_htentry_from_rcpointer2_to_rcpointer&))
 {
        var cl_heap_weak_hashtable_from_rcpointer2_to_rcpointer* ht = new cl_heap_weak_hashtable_from_rcpointer2_to_rcpointer (maygc_htentry);
        ht->refcount = 1;