Revert "Microoptimization in merge"
This reverts commit cb9e4bbf7446e45365cad2242087f2a766662f20.
This commit is contained in:
parent
08568b11f5
commit
c131466a00
@ -895,9 +895,7 @@ static GPtrArray *merge(GPtrArray *big_array, GPtrArray *small_array,
|
|||||||
while (i1 <= j1)
|
while (i1 <= j1)
|
||||||
{
|
{
|
||||||
val1 = big_array->pdata[i1];
|
val1 = big_array->pdata[i1];
|
||||||
/* we allocated enough space so we are sure we don't need to reallocate
|
g_ptr_array_add(res_array, val1);
|
||||||
* the array - copy and increment the size directly so it can be inlined */
|
|
||||||
res_array->pdata[res_array->len++] = val1;
|
|
||||||
i1++;
|
i1++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user