← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/myxt_xt.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-10-02 19:49:54 UTC
  • mto: (1823.1.1 trunk-drizzle)
  • mto: This revision was merged to the branch mainline in revision 1824.
  • Revision ID: osullivan.padraig@gmail.com-20101002194954-2sqp7a6szfgdl11l
Removal of all MyBitmap from the code base. Compiles but test failures exist now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/myxt_xt.cc
3346
3346
 
3347
3347
static void myxt_bitmap_init(XTThreadPtr self, MX_BITMAP *map, u_int n_bits)
3348
3348
{
 
3349
#ifdef DRIZZLED
 
3350
    (void) self;
 
3351
    map->resize(n_bits);
 
3352
    map->reset();
 
3353
#else
3349
3354
        my_bitmap_map   *buf;
3350
3355
    uint                        size_in_bytes = (((n_bits) + 31) / 32) * 4;
3351
 
 
3352
3356
        buf = (my_bitmap_map *) xt_malloc(self, size_in_bytes);
3353
 
 
3354
 
#ifdef DRIZZLED
3355
 
        map->init(buf, n_bits);
3356
 
#else
3357
3357
        map->bitmap= buf;
3358
3358
        map->n_bits= n_bits;
3359
3359
        create_last_word_mask(map);
3364
3364
static void myxt_bitmap_free(XTThreadPtr self, MX_BITMAP *map)
3365
3365
{
3366
3366
#ifdef DRIZZLED
3367
 
        my_bitmap_map *buf = map->getBitmap();
3368
 
        if (buf)
3369
 
                xt_free(self, buf);
3370
 
        map->setBitmap(NULL);
 
3367
    (void) self;
 
3368
    if (map->empty())
 
3369
        map->clear();
3371
3370
#else
3372
3371
        if (map->bitmap) {
3373
3372
                xt_free(self, map->bitmap);