pan2 r350 - in trunk: . pan/general

[csk svn gnome org]

Author: csk
Date: Sat Jul  5 19:29:51 2008
New Revision: 350
URL: http://svn.gnome.org/viewvc/pan2?rev=350&view=rev

Log:
#527853: unit test 'scorefile-test' fails on sparc


Modified:
   trunk/ChangeLog
   trunk/pan/general/quark.h

Modified: trunk/pan/general/quark.h
==============================================================================
--- trunk/pan/general/quark.h	(original)
+++ trunk/pan/general/quark.h	Sat Jul  5 19:29:51 2008
@@ -43,8 +43,6 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#define get16bits(d) (*((const uint16_t *) (d)))
-
 namespace pan
 {
   /**
@@ -84,6 +82,11 @@
 
       struct StringViewHash
       {
+        static uint16_t get16bits( const char * in )
+        {
+          return (in[0]<<8) | in[1];
+        }
+
         /**
          * Paul Hsieh's "SuperFastHash" algorithm, from
          * http://www.azillionmonkeys.com/qed/hash.html