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

util/Macros: replace with std::size() (C++17)

Browse Source
This commit is contained in:
Max Kellermann
2019-08-03 13:10:49 +02:00
parent d305f187d5
commit cde6c46d2f
27 changed files with 84 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/test_queue_priority.cxx
View File

@@ -1,9 +1,10 @@
#include "queue/Queue.hxx"
#include "song/DetachedSong.hxx"
#include "util/Macros.hxx"
#include <gtest/gtest.h>
#include <iterator>
Tag::Tag(const Tag &) noexcept {}
void Tag::Clear() noexcept {}
@@ -46,10 +47,10 @@ TEST(QueuePriority, Priority)
Queue queue(32);
for (unsigned i = 0; i < ARRAY_SIZE(songs); ++i)
for (unsigned i = 0; i < std::size(songs); ++i)
queue.Append(DetachedSong(songs[i]), 0);
EXPECT_EQ(unsigned(ARRAY_SIZE(songs)), queue.GetLength());
EXPECT_EQ(unsigned(std::size(songs)), queue.GetLength());
/* priority=10 for 4 items */
@@ -67,7 +68,7 @@ TEST(QueuePriority, Priority)
assert(queue.PositionToOrder(i) < 4);
}
for (unsigned i = 8; i < ARRAY_SIZE(songs); ++i) {
for (unsigned i = 8; i < std::size(songs); ++i) {
assert(queue.PositionToOrder(i) >= 4);
}