← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/mem/mem0pool.cc

  • Committer: Monty Taylor
  • Date: 2010-12-26 00:22:34 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226002234-2sb62sm2gs0iftuy
Fixing some of the innodb c++ casting issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/mem/mem0pool.cc
226
226
        ulint           i;
227
227
        ulint           used;
228
228
 
229
 
        pool = ut_malloc(sizeof(mem_pool_t));
 
229
        pool = static_cast<mem_pool_t *>(ut_malloc(sizeof(mem_pool_t)));
230
230
 
231
231
        /* We do not set the memory to zero (FALSE) in the pool,
232
232
        but only when allocated at a higher level in mem0mem.c.
233
233
        This is to avoid masking useful Purify warnings. */
234
234
 
235
 
        pool->buf = ut_malloc_low(size, FALSE, TRUE);
 
235
        pool->buf = static_cast<unsigned char *>(ut_malloc_low(size, FALSE, TRUE));
236
236
        pool->size = size;
237
237
 
238
238
        mutex_create(mem_pool_mutex_key, &pool->mutex, SYNC_MEM_POOL);