oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Queue: use std::swap

Browse Source
This commit is contained in:
Max Kellermann 2013-01-06 23:44:59 +01:00
parent 108242042e
commit 6936c0e2ab
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Queue.cxx
View File

@ -145,13 +145,10 @@ queue::Append(struct song *song, uint8_t priority)
void void
queue::SwapPositions(unsigned position1, unsigned position2) queue::SwapPositions(unsigned position1, unsigned position2)
{ {
struct queue_item tmp;
unsigned id1 = items[position1].id; unsigned id1 = items[position1].id;
unsigned id2 = items[position2].id; unsigned id2 = items[position2].id;
tmp = items[position1]; std::swap(items[position1], items[position2]);
items[position1] = items[position2];
items[position2] = tmp;
items[position1].version = version; items[position1].version = version;
items[position2].version = version; items[position2].version = version;

6
src/Queue.hxx
View File

@ -24,6 +24,8 @@
#include <glib.h> #include <glib.h>
#include <algorithm>
#include <assert.h> #include <assert.h>
#include <stdint.h> #include <stdint.h>
@ -265,9 +267,7 @@ struct queue {
* Swaps two songs, addressed by their order number. * Swaps two songs, addressed by their order number.
*/ */
void SwapOrders(unsigned order1, unsigned order2) { void SwapOrders(unsigned order1, unsigned order2) {
unsigned tmp = order[order1]; std::swap(order[order1], order[order2]);
order[order1] = order[order2];
order[order2] = tmp;
} }
/** /**