alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bitvect: Fix compilation on 32-bits hosts.

Browse source 
* src/misc/bitvect.cc: Conditionally declare fnv<8>, so that the C++
parser does not choke on 14695981039346656037UL when compiling on a
32bit host.  Problem observed with g++ 4.0.1 and 4.2.1 on Darwin.
This commit is contained in:
Alexandre Duret-Lutz 2014-01-15 14:40:27 +01:00
parent 9ccdef9cbd
commit 534edd4d1c
1 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/misc/bitvect.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*- // -*- coding: utf-8 -*-
// Copyright (C) 2013 Laboratoire de Recherche et Développement // Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement
// de l'Epita (LRDE). // de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
@ -26,6 +26,7 @@
#include <cmath> #include <cmath>
#include <hashfunc.hh> #include <hashfunc.hh>
#include <cstring> #include <cstring>
#include <climits>
namespace spot namespace spot
{ {
@ -42,9 +43,20 @@ namespace spot
return n; return n;
} }
// Fowler–Noll–Vo hash parameters for 64bits // Fowler-Noll-Vo hash parameters.
// Add specializations as needed.
template<int numbytes> template<int numbytes>
struct fnv struct fnv
{
};
// Do not define the following if ULONG_MAX cannot
// hold a 64-bit value, otherwise the parser will
// choke when parsing the constants.
#if ULONG_MAX >> 31 >> 31 >> 1 > 0
// Fowler-Noll-Vo hash parameters for 64bits
template<>
struct fnv<8>
{ {
static unsigned long init() static unsigned long init()
{ {
@ -56,19 +68,20 @@ namespace spot
return 1099511628211UL; return 1099511628211UL;
} }
}; };
#endif
// Fowler–Noll–Vo hash parameters for 32bits // Fowler-Noll-Vo hash parameters for 32bits
template<> template<>
struct fnv<4> struct fnv<4>
{ {
static unsigned int init() static unsigned long init()
{ {
return 2166136261U; return 2166136261UL;
} }
static unsigned int prime() static unsigned long prime()
{ {
return 16777619U; return 16777619UL;
} }
}; };