← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/ut/ut0vec.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/ut/ut0vec.cc
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 2006, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (C) 2006, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
11
11
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
12
12
 
13
13
You should have received a copy of the GNU General Public License along with
14
 
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
15
 
Place, Suite 330, Boston, MA 02111-1307 USA
 
14
this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
 
15
St, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
*****************************************************************************/
18
18
 
39
39
        mem_heap_t*     heap,   /*!< in: heap */
40
40
        ulint           size)   /*!< in: initial size */
41
41
{
42
 
        ib_vector_t*    vec;
43
 
 
44
42
        ut_a(size > 0);
45
43
 
46
 
        vec = mem_heap_alloc(heap, sizeof(*vec));
 
44
        ib_vector_t *vec = static_cast<ib_vector_t*>(mem_heap_alloc(heap, sizeof(*vec)));
47
45
 
48
46
        vec->heap = heap;
49
 
        vec->data = mem_heap_alloc(heap, sizeof(void*) * size);
 
47
        vec->data = static_cast<void **>(mem_heap_alloc(heap, sizeof(void*) * size));
50
48
        vec->used = 0;
51
49
        vec->total = size;
52
50
 
66
64
                void**  new_data;
67
65
                ulint   new_total = vec->total * 2;
68
66
 
69
 
                new_data = mem_heap_alloc(vec->heap,
70
 
                                          sizeof(void*) * new_total);
 
67
                new_data = static_cast<void **>(mem_heap_alloc(vec->heap,
 
68
                                        sizeof(void*) * new_total));
71
69
                memcpy(new_data, vec->data, sizeof(void*) * vec->total);
72
70
 
73
 
                vec->data = new_data;
 
71
                vec->data = static_cast<void **>(new_data);
74
72
                vec->total = new_total;
75
73
        }
76
74