← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/mtr/mtr0mtr.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/mtr/mtr0mtr.cc
102
102
 
103
103
        while (offset > 0) {
104
104
                offset -= sizeof(mtr_memo_slot_t);
105
 
                slot = dyn_array_get_element(memo, offset);
 
105
                slot = static_cast<mtr_memo_slot_t *>(dyn_array_get_element(memo, offset));
106
106
 
107
107
                mtr_memo_slot_release(mtr, slot);
108
108
        }
159
159
                mtr_memo_slot_t* slot;
160
160
 
161
161
                offset -= sizeof(mtr_memo_slot_t);
162
 
                slot = dyn_array_get_element(memo, offset);
 
162
                slot = static_cast<mtr_memo_slot_t *>(dyn_array_get_element(memo, offset));
163
163
 
164
164
                mtr_memo_slot_note_modification(mtr, slot);
165
165
        }
297
297
        while (offset > savepoint) {
298
298
                offset -= sizeof(mtr_memo_slot_t);
299
299
 
300
 
                slot = dyn_array_get_element(memo, offset);
 
300
                slot = static_cast<mtr_memo_slot_t *>(dyn_array_get_element(memo, offset));
301
301
 
302
302
                ut_ad(slot->type != MTR_MEMO_MODIFY);
303
303
 
334
334
        while (offset > 0) {
335
335
                offset -= sizeof(mtr_memo_slot_t);
336
336
 
337
 
                slot = dyn_array_get_element(memo, offset);
 
337
                slot = static_cast<mtr_memo_slot_t *>(dyn_array_get_element(memo, offset));
338
338
 
339
339
                if (object == slot->object && type == slot->type) {
340
340