← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/eval0eval.ic

  • 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/include/eval0eval.ic
73
73
        dfield = que_node_get_val(node);
74
74
        dfield_set_len(dfield, size);
75
75
 
76
 
        data = dfield_get_data(dfield);
 
76
        data = static_cast<unsigned char *>(dfield_get_data(dfield));
77
77
 
78
78
        if (!data || que_node_get_val_buf_size(node) < size) {
79
79
 
118
118
                return;
119
119
        }
120
120
 
121
 
        eval_func(exp_node);
 
121
        eval_func(static_cast<func_node_t *>(exp_node));
122
122
}
123
123
 
124
124
/*****************************************************************//**
135
135
 
136
136
        dfield = que_node_get_val(node);
137
137
 
138
 
        data = dfield_get_data(dfield);
 
138
        data = static_cast<byte *>(dfield_get_data(dfield));
139
139
 
140
140
        if (data == NULL) {
141
141
                data = eval_node_alloc_val_buf(node, 4);
161
161
 
162
162
        ut_ad(dfield_get_len(dfield) == 4);
163
163
 
164
 
        return((int)mach_read_from_4(dfield_get_data(dfield)));
 
164
        return((int)mach_read_from_4(static_cast<const unsigned char *>(dfield_get_data(dfield))));
165
165
}
166
166
 
167
167
/*****************************************************************//**
178
178
 
179
179
        dfield = que_node_get_val(node);
180
180
 
181
 
        data = dfield_get_data(dfield);
 
181
        data = static_cast<byte *>(dfield_get_data(dfield));
182
182
 
183
183
        ut_ad(data != NULL);
184
184
 
199
199
 
200
200
        dfield = que_node_get_val(func_node);
201
201
 
202
 
        data = dfield_get_data(dfield);
 
202
        data = static_cast<byte *>(dfield_get_data(dfield));
203
203
 
204
204
        if (data == NULL) {
205
205
                /* Allocate 1 byte to hold the value */
249
249
 
250
250
        dfield2 = que_node_get_val(node2);
251
251
 
252
 
        eval_node_copy_and_alloc_val(node1, dfield_get_data(dfield2),
 
252
        eval_node_copy_and_alloc_val(node1,
 
253
                                     static_cast<unsigned char *>(dfield_get_data(dfield2)),
253
254
                                     dfield_get_len(dfield2));
254
255
}