Skip to content

M
mpd
Commit 6cafec8a authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Queue: allocate memory with new/delete

parent 8ef87be4
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/Queue.cxx
View file @ 6cafec8a
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
queue::queue(unsigned _max_length) queue::queue(unsigned _max_length)
:max_length(_max_length), length(0), :max_length(_max_length), length(0),
version(1), version(1),
items(g_new(Item, max_length)), items(new Item[max_length]),
order((unsigned *)g_malloc(sizeof(order[0]) * max_length)), order(new unsigned[max_length]),
id_table(max_length * HASH_MULT), id_table(max_length * HASH_MULT),
repeat(false), repeat(false),
single(false), single(false),
...@@ -40,8 +40,8 @@ queue::~queue() ...@@ -40,8 +40,8 @@ queue::~queue()
{ {
Clear(); Clear();
g_free(items); delete[] items;
g_free(order); delete[] order;
} }
int int
...@@ -290,7 +290,7 @@ queue_item_compare_order_priority(gconstpointer av, gconstpointer bv, ...@@ -290,7 +290,7 @@ queue_item_compare_order_priority(gconstpointer av, gconstpointer bv,
uint8_t a = queue->items[*ap].priority; uint8_t a = queue->items[*ap].priority;
uint8_t b = queue->items[*bp].priority; uint8_t b = queue->items[*bp].priority;
if (G_LIKELY(a == b)) if (gcc_likely(a == b))
return 0; return 0;
else if (a > b) else if (a > b)
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment