From 815b2489907c098bdb1abbc03bcf62b706b54163 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 7 Mar 2023 11:59:39 +0100 Subject: [PATCH] */Registry: use `constinit` --- src/archive/ArchiveList.cxx | 2 +- src/db/Registry.cxx | 2 +- src/decoder/DecoderList.cxx | 2 +- src/encoder/EncoderList.cxx | 2 +- src/filter/Registry.cxx | 2 +- src/input/Registry.cxx | 2 +- src/neighbor/Registry.cxx | 2 +- src/output/Registry.cxx | 2 +- src/playlist/PlaylistRegistry.cxx | 2 +- src/storage/Registry.cxx | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/archive/ArchiveList.cxx b/src/archive/ArchiveList.cxx index 80eae45cc..38359d3ef 100644 --- a/src/archive/ArchiveList.cxx +++ b/src/archive/ArchiveList.cxx @@ -15,7 +15,7 @@ #include -constexpr const ArchivePlugin *archive_plugins[] = { +constinit const ArchivePlugin *const archive_plugins[] = { #ifdef ENABLE_BZ2 &bz2_archive_plugin, #endif diff --git a/src/db/Registry.cxx b/src/db/Registry.cxx index 167be0d6d..5eb66d72a 100644 --- a/src/db/Registry.cxx +++ b/src/db/Registry.cxx @@ -10,7 +10,7 @@ #include -constexpr const DatabasePlugin *database_plugins[] = { +constinit const DatabasePlugin *const database_plugins[] = { &simple_db_plugin, #ifdef ENABLE_LIBMPDCLIENT &proxy_db_plugin, diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx index b517f448f..0e968403c 100644 --- a/src/decoder/DecoderList.cxx +++ b/src/decoder/DecoderList.cxx @@ -39,7 +39,7 @@ #include -constexpr const struct DecoderPlugin *decoder_plugins[] = { +constinit const struct DecoderPlugin *const decoder_plugins[] = { #ifdef ENABLE_MAD &mad_decoder_plugin, #endif diff --git a/src/encoder/EncoderList.cxx b/src/encoder/EncoderList.cxx index 9413908c2..f4db535d0 100644 --- a/src/encoder/EncoderList.cxx +++ b/src/encoder/EncoderList.cxx @@ -17,7 +17,7 @@ #include -constexpr const EncoderPlugin *encoder_plugins[] = { +constinit const EncoderPlugin *const encoder_plugins[] = { &null_encoder_plugin, #ifdef ENABLE_VORBISENC &vorbis_encoder_plugin, diff --git a/src/filter/Registry.cxx b/src/filter/Registry.cxx index e358d82bf..c4c285eb0 100644 --- a/src/filter/Registry.cxx +++ b/src/filter/Registry.cxx @@ -12,7 +12,7 @@ #include -static constexpr const FilterPlugin *filter_plugins[] = { +static constinit const FilterPlugin *const filter_plugins[] = { &null_filter_plugin, &route_filter_plugin, &normalize_filter_plugin, diff --git a/src/input/Registry.cxx b/src/input/Registry.cxx index b0241e170..7e744a3d8 100644 --- a/src/input/Registry.cxx +++ b/src/input/Registry.cxx @@ -35,7 +35,7 @@ #include "plugins/CdioParanoiaInputPlugin.hxx" #endif -constexpr const InputPlugin *input_plugins[] = { +constinit const InputPlugin *const input_plugins[] = { #ifdef ENABLE_ALSA &input_plugin_alsa, #endif diff --git a/src/neighbor/Registry.cxx b/src/neighbor/Registry.cxx index baabfb852..8ded2eea1 100644 --- a/src/neighbor/Registry.cxx +++ b/src/neighbor/Registry.cxx @@ -10,7 +10,7 @@ #include -constexpr const NeighborPlugin *neighbor_plugins[] = { +constinit const NeighborPlugin *const neighbor_plugins[] = { #ifdef ENABLE_SMBCLIENT &smbclient_neighbor_plugin, #endif diff --git a/src/output/Registry.cxx b/src/output/Registry.cxx index e4ab67fc8..3dacd3e5e 100644 --- a/src/output/Registry.cxx +++ b/src/output/Registry.cxx @@ -31,7 +31,7 @@ #endif #include "util/StringAPI.hxx" -constexpr const AudioOutputPlugin *audio_output_plugins[] = { +constinit const AudioOutputPlugin *const audio_output_plugins[] = { #ifdef HAVE_SHOUT &shout_output_plugin, #endif diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx index ffe395894..8af50d800 100644 --- a/src/playlist/PlaylistRegistry.cxx +++ b/src/playlist/PlaylistRegistry.cxx @@ -26,7 +26,7 @@ #include #include -constexpr const PlaylistPlugin *playlist_plugins[] = { +constinit const PlaylistPlugin *const playlist_plugins[] = { &extm3u_playlist_plugin, &m3u_playlist_plugin, &pls_playlist_plugin, diff --git a/src/storage/Registry.cxx b/src/storage/Registry.cxx index 54423cc07..9d149cdc1 100644 --- a/src/storage/Registry.cxx +++ b/src/storage/Registry.cxx @@ -13,7 +13,7 @@ #include -constexpr const StoragePlugin *storage_plugins[] = { +constinit const StoragePlugin *const storage_plugins[] = { &local_storage_plugin, #ifdef ENABLE_SMBCLIENT &smbclient_storage_plugin,