message: include/bitmap: use uint64_t and friends
diff: */
  #include <assert.h>
  +#include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  @@ -34,7 +35,7 @@ public:
  * @param nelts the number of elements needed.
  */
  - void reserve(unsigned long long nelts) {
  + void reserve(uint64_t nelts) {
  if (_bitarray) {
  Heap::free(_bitarray);
  }
  @@ -54,8 +55,8 @@ public:
  }
  /// @return true iff the bit was not set (but it is now).
  - inline bool tryToSet(unsigned long long index) {
  - unsigned int item, position;
  + inline bool tryToSet(uint64_t index) {
  + uint32_t item, position;
  computeItemPosition(index, item, position);
  const WORD mask = getMask(position);
  unsigned long oldvalue = _bitarray[item];
  @@ -64,8 +65,8 @@ public:
  }
  /// Clears the bit at the given index.
  - inline bool reset(unsigned long long index) {
  - unsigned int item, position;
  + inline bool reset(uint64_t index) {
  + uint32_t item, position;
  computeItemPosition(index, item, position);
  unsigned long oldvalue = _bitarray[item];
  WORD newvalue = oldvalue & ~(getMask(position));
  @@ -73,8 +74,8 @@ public:
  return (oldvalue != newvalue);
  }
  - inline bool isSet(unsigned long long index) const {
  - unsigned int item, position;
  + inline bool isSet(uint64_t index) const {
  + uint32_t item, position;
  computeItemPosition(index, item, position);
  bool result = _bitarray[item] & getMask(position);
  return result;
  @@ -82,7 +83,7 @@ public:
  private:
  /// Given an index, compute its item (word) and position within the word.
  - void computeItemPosition(unsigned long long index, unsigned int& item, unsigned int& position) const {
  + void computeItemPosition(uint64_t index, uint32_t& item, uint32_t& position) const {
  assert(index < _elements);
  item = index >> WORDBITSHIFT;
  position = index & (WORDBITS - 1);
  @@ -95,7 +96,7 @@ private:
  /// To find the bit in a word, do this: word & getMask(bitPosition)
  /// @return a "mask" for the given position.
  - inline static WORD getMask(unsigned long long pos) {
  + inline static WORD getMask(uint64_t pos) {
  return ((WORD)1) << pos;
  }
  @@ -106,11 +107,7 @@ private:
  enum { WORDBYTES = sizeof(WORD) };
  /// The log of the number of bits in a WORD, for shifting.
  -#if __cplusplus > 199711L
  enum { WORDBITSHIFT = staticlog(WORDBITS) };
  -#else
  - enum { WORDBITSHIFT = StaticLog<WORDBITS>::VALUE };
  -#endif
  /// The bit array itself.
  WORD* _bitarray;
  