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

7
src/sticker/Database.cxx
View File

@@ -22,10 +22,11 @@
#include "lib/sqlite/Util.hxx"
#include "fs/Path.hxx"
#include "Idle.hxx"
#include "util/Macros.hxx"
#include "util/StringCompare.hxx"
#include "util/ScopeExit.hxx"
#include <iterator>
#include <assert.h>
using namespace Sqlite;
@@ -98,7 +99,7 @@ StickerDatabase::StickerDatabase(Path path)
/* prepare the statements we're going to use */
for (unsigned i = 0; i < ARRAY_SIZE(sticker_sql); ++i) {
for (unsigned i = 0; i < std::size(sticker_sql); ++i) {
assert(sticker_sql[i] != nullptr);
stmt[i] = Prepare(db, sticker_sql[i]);
@@ -109,7 +110,7 @@ StickerDatabase::~StickerDatabase() noexcept
{
assert(db != nullptr);
for (unsigned i = 0; i < ARRAY_SIZE(stmt); ++i) {
for (unsigned i = 0; i < std::size(stmt); ++i) {
assert(stmt[i] != nullptr);
sqlite3_finalize(stmt[i]);