unsigned long -> size_t (finally!)

1 files changed, 6 insertions, 4 deletions

diff --git a/utils/HashTable.h b/utils/HashTable.h
index c30e5c7..2db7b93 100644
--- a/utils/HashTable.h
+++ b/utils/HashTable.h
@@ -3,7 +3,7 @@
  *
  *	by Stephane Chatty
  *
- *	Copyright 1991, 1992
+ *	Copyright 1991-1995
  *	Laboratoire de Recherche en Informatique (LRI)
  *	Centre d'Etudes de la Navigation Aerienne (CENA)
  *
@@ -19,6 +19,7 @@
 
 
 #include "cplus_bugs.h"
+#include <sys/types.h>
 
 class CcuAllocator;
 
@@ -42,7 +43,7 @@ inline	void	SetInfo (CcuHashItem* p)			{ Info = p; }
 inline	CcuHashItem*	GetInfo () const			{ return Info; }
 inline	const void*	GetKey () const			{ return Key; }
 
-	void*	operator new (unsigned long);
+	void*	operator new (size_t);
 	void	operator delete (void*);
 };
 
@@ -106,7 +107,7 @@ inline	int	GetSize () const		{ return Size; }
 class CcuDictionnary : public CcuHashTable {
 protected:
 static	void*	CopyString (const void*);
-static	void	DeleteString (void*);
+static	void	DeleteString (const void*);
 static	int	CompareString (const void*, const void*);
 
 
@@ -147,7 +148,8 @@ public:
 inline		CcuHashIter (const CcuHashTable& t) : CcuHashCellIter (t) { }
 inline		~CcuHashIter () {}
 
-inline	CcuHashIter&	operator ++ ()	{ ++((CcuHashCellIter) (*this)); return *this; }
+//inline	CcuHashIter&	operator ++ ()	{ ++((CcuHashCellIter) (*this)); return *this; }
+inline	CcuHashIter&	operator ++ ()	{ return (CcuHashIter&)(this->CcuHashCellIter::operator ++ ()); }
 inline	CcuHashItem*	operator * () const	{ return CurCell ? CurCell->GetInfo () : 0; }
 };