summaryrefslogtreecommitdiffstats
path: root/src/objcache.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-01-20 13:31:30 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-01-20 13:31:30 (GMT)
commitdcd4714c4413348d02eb7224dafee5d06be43dfb (patch)
tree3872f0367bbee22883a702d1d2f799c9a9c2e8ac /src/objcache.cpp
parent775ab3be95c02dd805aadc73ffbe3c18877c12a4 (diff)
downloadDoxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.zip
Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.tar.gz
Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.tar.bz2
Release-1.8.3.1
Diffstat (limited to 'src/objcache.cpp')
-rw-r--r--src/objcache.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/objcache.cpp b/src/objcache.cpp
index 4258397..989811a 100644
--- a/src/objcache.cpp
+++ b/src/objcache.cpp
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2012 by Dimitri van Heesch.
+ * Copyright (C) 1997-2013 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
@@ -19,6 +19,9 @@
#include <assert.h>
#include <qglobal.h>
#include "objcache.h"
+#if !defined(_OS_WIN32_)
+#include <stdint.h>
+#endif
//----------------------------------------------------------------------
@@ -189,7 +192,7 @@ unsigned int ObjCache::hash(void *addr)
else
{
// Thomas Wang's 32 bit Mix Function
- unsigned long key = (unsigned long)addr;
+ uintptr_t key = (uintptr_t)addr;
key += ~(key << 15);
key ^= (key >> 10);
key += (key << 3);