← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_bitmap.h

Merged changes from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_bitmap.h
56
56
  void intersect_extended(ulonglong map2buff)
57
57
  {
58
58
    intersect(map2buff);
59
 
    if (map.n_bits > sizeof(ulonglong) * 8)
60
 
      bitmap_set_above(&map, sizeof(ulonglong),
61
 
                       test(map2buff & (LL(1) << (sizeof(ulonglong) * 8 - 1))));
 
59
    if (map.n_bits > sizeof(uint64_t) * 8)
 
60
      bitmap_set_above(&map, sizeof(uint64_t),
 
61
                       test(map2buff & (1 << (sizeof(uint64_t) * 8 - 1))));
62
62
  }
63
63
  void subtract(Bitmap& map2) { bitmap_subtract(&map, &map2.map); }
64
64
  void merge(Bitmap& map2) { bitmap_union(&map, &map2.map); }
210
210
      if (!bmp)
211
211
        return BITMAP_END;
212
212
    }
213
 
    bmp &= ~(1LL << bit);
 
213
    bmp &= ~(1 << bit);
214
214
    return no + bit;
215
215
  }
216
216
  enum { BITMAP_END= 64 };