replace assert.h with cassert

The former was deprecated with C++14. According to the C++11 and C++17 standards, both files are identical. Signed-off-by: Rosen Penev <rosenp@gmail.com>

replace assert.h with cassert
ab9f5d20 · Rosen Penev · a718086f · ab9f5d20 · ab9f5d20 · ab9f5d20
Unverified Commit ab9f5d20 authored Mar 12, 2020 by Rosen Penev
246 changed files
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -23,8 +23,8 @@
 #include "util/StringView.hxx"

 #include <algorithm>
+#include <cassert>

-#include <assert.h>
 #include <string.h>

 #ifdef HAVE_ICU_CONVERTER

--- a/src/Idle.cxx
+++ b/src/Idle.cxx
@@ -26,7 +26,7 @@
 #include "Main.hxx"
 #include "Instance.hxx"

-#include <assert.h>
+#include <cassert>

 void
 idle_add(unsigned flags)

--- a/src/IdleFlags.cxx
+++ b/src/IdleFlags.cxx
@@ -25,7 +25,7 @@
 #include "IdleFlags.hxx"
 #include "util/ASCII.hxx"

-#include <assert.h>
+#include <cassert>

 static const char *const idle_names[] = {
 	"database",

--- a/src/LogBackend.cxx
+++ b/src/LogBackend.cxx
@@ -23,7 +23,8 @@
 #include "util/StringStrip.hxx"
 #include "config.h"

-#include <assert.h>
+#include <cassert>
+
 #include <stdio.h>
 #include <string.h>
 #include <time.h>

--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@@ -30,11 +30,12 @@
 #include "util/RuntimeError.hxx"
 #include "system/Error.hxx"

+#include <cassert>
+
 #ifdef ENABLE_SYSTEMD_DAEMON
 #include <systemd/sd-daemon.h>
 #endif

-#include <assert.h>
 #include <string.h>
 #include <fcntl.h>
 #include <stdio.h>

--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -33,7 +33,7 @@
 #include "Main.hxx"
 #endif

-#include <assert.h>
+#include <cassert>

 /**
 * The absolute path of the playlist directory encoded in the

--- a/src/MusicBuffer.cxx
+++ b/src/MusicBuffer.cxx
@@ -20,7 +20,7 @@
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"

-#include <assert.h>
+#include <cassert>

 MusicBuffer::MusicBuffer(unsigned num_chunks)
 	:buffer(num_chunks) {

--- a/src/MusicChunk.cxx
+++ b/src/MusicChunk.cxx
@@ -21,7 +21,7 @@
 #include "pcm/AudioFormat.hxx"
 #include "tag/Tag.hxx"

-#include <assert.h>
+#include <cassert>

 MusicChunkInfo::MusicChunkInfo() noexcept = default;
 MusicChunkInfo::~MusicChunkInfo() noexcept = default;

--- a/src/MusicPipe.cxx
+++ b/src/MusicPipe.cxx
@@ -20,7 +20,7 @@
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"

-#include <assert.h>
+#include <cassert>

 #ifndef NDEBUG


--- a/src/Permission.cxx
+++ b/src/Permission.cxx
@@ -26,11 +26,11 @@
 #include "util/RuntimeError.hxx"
 #include "util/StringView.hxx"

+#include <cassert>
 #include <map>
 #include <string>
 #include <utility>

-#include <assert.h>
 #include <string.h>

 static constexpr char PERMISSION_PASSWORD_CHAR = '@';

--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -42,7 +42,8 @@
 #include "util/StringCompare.hxx"
 #include "util/UriExtract.hxx"

-#include <assert.h>
+#include <cassert>
+
 #include <string.h>

 static const char PLAYLIST_COMMENT = '#';

--- a/src/ReplayGainGlobal.cxx
+++ b/src/ReplayGainGlobal.cxx
@@ -21,9 +21,9 @@
 #include "ReplayGainConfig.hxx"
 #include "config/Data.hxx"

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
 #include <stdlib.h>
 #include <math.h>


--- a/src/ReplayGainMode.cxx
+++ b/src/ReplayGainMode.cxx
@@ -19,9 +19,9 @@

 #include "ReplayGainMode.hxx"

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
 #include <string.h>

 const char *

--- a/src/SingleMode.cxx
+++ b/src/SingleMode.cxx
@@ -19,9 +19,9 @@

 #include "SingleMode.hxx"

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
 #include <string.h>

 const char *

--- a/src/SongLoader.cxx
+++ b/src/SongLoader.cxx
@@ -26,7 +26,7 @@
 #include "PlaylistError.hxx"
 #include "config.h"

-#include <assert.h>
+#include <cassert>

 #ifdef ENABLE_DATABASE


--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -34,7 +34,8 @@
 #include "TagArchive.hxx"
 #endif

-#include <assert.h>
+#include <cassert>
+
 #include <string.h>

 #ifdef ENABLE_DATABASE

--- a/src/TagFile.cxx
+++ b/src/TagFile.cxx
@@ -27,7 +27,7 @@
 #include "input/InputStream.hxx"
 #include "input/LocalOpen.hxx"

-#include <assert.h>
+#include <cassert>

 class TagFileScan {
 	const Path path_fs;

--- a/src/TagStream.cxx
+++ b/src/TagStream.cxx
@@ -28,7 +28,7 @@
 #include "thread/Mutex.hxx"
 #include "util/UriExtract.hxx"

-#include <assert.h>
+#include <cassert>

 /**
 * Does the #DecoderPlugin support either the suffix or the MIME type?

--- a/src/archive/ArchiveList.cxx
+++ b/src/archive/ArchiveList.cxx
@@ -25,9 +25,9 @@
 #include "plugins/Iso9660ArchivePlugin.hxx"
 #include "plugins/ZzipArchivePlugin.hxx"

+#include <cassert>
 #include <iterator>

-#include <assert.h>
 #include <string.h>

 const ArchivePlugin *const archive_plugins[] = {

--- a/src/archive/ArchivePlugin.cxx
+++ b/src/archive/ArchivePlugin.cxx
@@ -21,7 +21,7 @@
 #include "ArchiveFile.hxx"
 #include "fs/Path.hxx"

-#include <assert.h>
+#include <cassert>

 std::unique_ptr<ArchiveFile>
 archive_file_open(const ArchivePlugin *plugin, Path path)

--- a/src/client/Idle.cxx
+++ b/src/client/Idle.cxx
@@ -22,7 +22,7 @@
 #include "Response.hxx"
 #include "Idle.hxx"

-#include <assert.h>
+#include <cassert>

 static void
 WriteIdleResponse(Response &r, unsigned flags) noexcept

--- a/src/client/List.cxx
+++ b/src/client/List.cxx
@@ -20,7 +20,7 @@
 #include "List.hxx"
 #include "util/DeleteDisposer.hxx"

-#include <assert.h>
+#include <cassert>

 ClientList::~ClientList() noexcept
 {

--- a/src/client/New.cxx
+++ b/src/client/New.cxx
@@ -29,7 +29,7 @@
 #include "net/ToString.hxx"
 #include "Log.hxx"

-#include <assert.h>
+#include <cassert>

 static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";


--- a/src/client/Subscribe.cxx
+++ b/src/client/Subscribe.cxx
@@ -21,7 +21,7 @@
 #include "Partition.hxx"
 #include "IdleFlags.hxx"

-#include <assert.h>
+#include <cassert>

 Client::SubscribeResult
 Client::Subscribe(const char *channel) noexcept

--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -48,9 +48,9 @@
 #include "StickerCommands.hxx"
 #endif

+#include <cassert>
 #include <iterator>

-#include <assert.h>
 #include <string.h>

 /*

--- a/src/command/CommandListBuilder.hxx
+++ b/src/command/CommandListBuilder.hxx
@@ -20,11 +20,10 @@
 #ifndef MPD_COMMAND_LIST_BUILDER_HXX
 #define MPD_COMMAND_LIST_BUILDER_HXX

+#include <cassert>
 #include <list>
 #include <string>

-#include <assert.h>
-
 class CommandListBuilder {
 	/**
 	 * print OK after each command execution

--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -43,7 +43,8 @@
 #include "thread/Mutex.hxx"
 #include "Log.hxx"

-#include <assert.h>
+#include <cassert>
+
 #include <inttypes.h> /* for PRIu64 */

 gcc_pure

--- a/src/command/MessageCommands.cxx
+++ b/src/command/MessageCommands.cxx
@@ -25,11 +25,10 @@
 #include "util/ConstBuffer.hxx"
 #include "Partition.hxx"

+#include <cassert>
 #include <set>
 #include <string>

-#include <assert.h>
-
 CommandResult
 handle_subscribe(Client &client, Request args, Response &r)
 {

--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@@ -55,7 +55,7 @@
 #include "db/update/Service.hxx"
 #endif

-#include <assert.h>
+#include <cassert>

 static void
 print_spl_list(Response &r, const PlaylistVector &list)

--- a/src/command/Request.hxx
+++ b/src/command/Request.hxx
@@ -25,10 +25,9 @@
 #include "Chrono.hxx"
 #include "util/ConstBuffer.hxx"

+#include <cassert>
 #include <utility>

-#include <assert.h>
-
 class Response;

 class Request : public ConstBuffer<const char *> {

--- a/src/config/File.cxx
+++ b/src/config/File.cxx
@@ -35,7 +35,7 @@
 #include "fs/io/BufferedReader.hxx"
 #include "Log.hxx"

-#include <assert.h>
+#include <cassert>

 static constexpr char CONF_COMMENT = '#';


--- a/src/config/Path.cxx
+++ b/src/config/Path.cxx
@@ -24,7 +24,8 @@
 #include "fs/StandardDirectory.hxx"
 #include "util/RuntimeError.hxx"

-#include <assert.h>
+#include <cassert>
+
 #include <string.h>

 #ifndef _WIN32

--- a/src/db/DatabaseLock.hxx
+++ b/src/db/DatabaseLock.hxx
@@ -29,7 +29,7 @@
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"

-#include <assert.h>
+#include <cassert>

 extern Mutex db_mutex;


--- a/src/db/DatabaseSong.cxx
+++ b/src/db/DatabaseSong.cxx
@@ -26,7 +26,7 @@
 #include "util/UriExtract.hxx"
 #include "util/UriRelative.hxx"

-#include <assert.h>
+#include <cassert>

 DetachedSong
 DatabaseDetachSong(const Storage *storage, const LightSong &song) noexcept

--- a/src/db/PlaylistVector.cxx
+++ b/src/db/PlaylistVector.cxx
@@ -21,8 +21,7 @@
 #include "db/DatabaseLock.hxx"

 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>

 PlaylistVector::iterator
 PlaylistVector::find(const char *name) noexcept

--- a/src/db/VHelper.cxx
+++ b/src/db/VHelper.cxx
@@ -23,9 +23,9 @@
 #include "song/Filter.hxx"

 #include <algorithm>
+#include <cassert>
 #include <utility>

-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>


--- a/src/db/plugins/simple/Directory.cxx
+++ b/src/db/plugins/simple/Directory.cxx
@@ -33,7 +33,8 @@
 #include "util/Alloc.hxx"
 #include "util/DeleteDisposer.hxx"

-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <stdlib.h>


--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
@@ -40,10 +40,10 @@
 #include "util/RecursiveMap.hxx"
 #include "util/SplitString.hxx"

+#include <cassert>
 #include <string>
 #include <utility>

-#include <assert.h>
 #include <string.h>

 static const char *const rootid = "0";

--- a/src/db/update/Editor.cxx
+++ b/src/db/update/Editor.cxx
@@ -24,7 +24,7 @@
 #include "db/plugins/simple/Directory.hxx"
 #include "db/plugins/simple/Song.hxx"

-#include <assert.h>
+#include <cassert>

 void
 DatabaseEditor::DeleteSong(Directory &dir, Song *del)

--- a/src/db/update/ExcludeList.cxx
+++ b/src/db/update/ExcludeList.cxx
@@ -29,7 +29,7 @@
 #include "util/StringStrip.hxx"
 #include "config.h"

-#include <assert.h>
+#include <cassert>

 #ifdef HAVE_CLASS_GLOB


--- a/src/db/update/InotifyUpdate.cxx
+++ b/src/db/update/InotifyUpdate.cxx
@@ -27,11 +27,11 @@
 #include "fs/Traits.hxx"
 #include "Log.hxx"

-#include <string>
-#include <map>
+#include <cassert>
 #include <forward_list>
+#include <map>
+#include <string>

-#include <assert.h>
 #include <sys/inotify.h>
 #include <string.h>
 #include <dirent.h>

--- a/src/db/update/Service.cxx
+++ b/src/db/update/Service.cxx
@@ -36,7 +36,7 @@
 #include "event/Loop.hxx"
 #endif

-#include <assert.h>
+#include <cassert>

 UpdateService::UpdateService(const ConfigData &_config,
 			     EventLoop &_loop, SimpleDatabase &_db,

--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -38,10 +38,10 @@
 #include "util/UriExtract.hxx"
 #include "Log.hxx"

+#include <cassert>
 #include <exception>
 #include <memory>

-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>

--- a/src/decoder/Bridge.cxx
+++ b/src/decoder/Bridge.cxx
@@ -36,7 +36,8 @@
 #include "util/ConstBuffer.hxx"
 #include "util/StringBuffer.hxx"

-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <math.h>


--- a/src/decoder/Control.cxx
+++ b/src/decoder/Control.cxx
@@ -21,10 +21,9 @@
 #include "MusicPipe.hxx"
 #include "song/DetachedSong.hxx"

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
-
 DecoderControl::DecoderControl(Mutex &_mutex, Cond &_client_cond,
 			       InputCacheManager *_input_cache,
 			       const AudioFormat _configured_audio_format,

--- a/src/decoder/Control.hxx
+++ b/src/decoder/Control.hxx
@@ -31,11 +31,11 @@
 #include "ReplayGainConfig.hxx"
 #include "ReplayGainMode.hxx"

+#include <cassert>
 #include <exception>
-#include <utility>
 #include <memory>
+#include <utility>

-#include <assert.h>
 #include <stdint.h>

 /* damn you, windows.h! */

--- a/src/decoder/DecoderAPI.cxx
+++ b/src/decoder/DecoderAPI.cxx
@@ -21,7 +21,7 @@
 #include "input/InputStream.hxx"
 #include "Log.hxx"

-#include <assert.h>
+#include <cassert>

 size_t
 decoder_read(DecoderClient *client,

--- a/src/decoder/DecoderPlugin.cxx
+++ b/src/decoder/DecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "DecoderPlugin.hxx"
 #include "util/StringUtil.hxx"

-#include <assert.h>
+#include <cassert>

 bool
 DecoderPlugin::SupportsSuffix(const char *suffix) const noexcept

--- a/src/decoder/DecoderPrint.cxx
+++ b/src/decoder/DecoderPrint.cxx
@@ -22,10 +22,9 @@
 #include "DecoderPlugin.hxx"
 #include "client/Response.hxx"

+#include <cassert>
 #include <functional>

-#include <assert.h>
-
 static void
 decoder_plugin_print(Response &r,
 		     const DecoderPlugin &plugin)

--- a/src/decoder/plugins/AdPlugDecoderPlugin.cxx
+++ b/src/decoder/plugins/AdPlugDecoderPlugin.cxx
@@ -29,7 +29,7 @@
 #include <adplug/adplug.h>
 #include <adplug/emuopl.h>

-#include <assert.h>
+#include <cassert>

 static constexpr Domain adplug_domain("adplug");


--- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx
+++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
@@ -29,9 +29,9 @@
 #include <audiofile.h>
 #include <af_vfs.h>

+#include <cassert>
 #include <exception>

-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>


--- a/src/decoder/plugins/FaadDecoderPlugin.cxx
+++ b/src/decoder/plugins/FaadDecoderPlugin.cxx
@@ -30,9 +30,9 @@

 #include <neaacdec.h>

+#include <cassert>
 #include <cmath>

-#include <assert.h>
 #include <string.h>

 static const unsigned adts_sample_rates[] =

--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -52,7 +52,8 @@ extern "C" {
 #include <libavutil/frame.h>
 }

-#include <assert.h>
+#include <cassert>
+
 #include <string.h>

 /**

--- a/src/decoder/plugins/FlacPcm.cxx
+++ b/src/decoder/plugins/FlacPcm.cxx
@@ -23,7 +23,7 @@
 #include "util/RuntimeError.hxx"
 #include "util/ConstBuffer.hxx"

-#include <assert.h>
+#include <cassert>

 void
 FlacPcmImport::Open(unsigned sample_rate, unsigned bits_per_sample,

--- a/src/decoder/plugins/FlacStreamDecoder.hxx
+++ b/src/decoder/plugins/FlacStreamDecoder.hxx
@@ -22,10 +22,9 @@

 #include <FLAC/stream_decoder.h>

-#include <utility>
+#include <cassert>
 #include <stdexcept>
-
-#include <assert.h>
+#include <utility>

 /**
 * OO wrapper for a FLAC__StreamDecoder.

--- a/src/decoder/plugins/GmeDecoderPlugin.cxx
+++ b/src/decoder/plugins/GmeDecoderPlugin.cxx
@@ -37,7 +37,8 @@

 #include <gme/gme.h>

-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 #include <string.h>


--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@@ -39,7 +39,8 @@
 #include <id3tag.h>
 #endif

-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

--- a/src/decoder/plugins/MikmodDecoderPlugin.cxx
+++ b/src/decoder/plugins/MikmodDecoderPlugin.cxx
@@ -29,7 +29,7 @@

 #include <mikmod.h>

-#include <assert.h>
+#include <cassert>

 static constexpr Domain mikmod_domain("mikmod");


--- a/src/decoder/plugins/ModplugDecoderPlugin.cxx
+++ b/src/decoder/plugins/ModplugDecoderPlugin.cxx
@@ -29,8 +29,7 @@

 #include <libmodplug/modplug.h>

-
-#include <assert.h>
+#include <cassert>

 static constexpr Domain modplug_domain("modplug");


--- a/src/decoder/plugins/WavpackDecoderPlugin.cxx
+++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx
@@ -31,13 +31,11 @@
 #include <wavpack/wavpack.h>

 #include <algorithm>
+#include <cassert>
+#include <cstdlib>
 #include <iterator>
 #include <memory>

-#include <cstdlib>
-
-#include <assert.h>
-
 #define ERRORLEN 80

 #ifdef OPEN_DSD_AS_PCM

--- a/src/encoder/EncoderInterface.hxx
+++ b/src/encoder/EncoderInterface.hxx
@@ -23,7 +23,8 @@
 #include "EncoderPlugin.hxx"
 #include "util/Compiler.h"

-#include <assert.h>
+#include <cassert>
+
 #include <stddef.h>

 struct AudioFormat;

--- a/src/encoder/plugins/LameEncoderPlugin.cxx
+++ b/src/encoder/plugins/LameEncoderPlugin.cxx
@@ -26,9 +26,9 @@

 #include <lame/lame.h>

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
 #include <string.h>

 class LameEncoder final : public Encoder {

--- a/src/encoder/plugins/OpusEncoderPlugin.cxx
+++ b/src/encoder/plugins/OpusEncoderPlugin.cxx
@@ -26,9 +26,9 @@
 #include <opus.h>
 #include <ogg/ogg.h>

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
 #include <stdlib.h>

 namespace {

--- a/src/encoder/plugins/TwolameEncoderPlugin.cxx
+++ b/src/encoder/plugins/TwolameEncoderPlugin.cxx
@@ -27,9 +27,9 @@

 #include <twolame.h>

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
 #include <string.h>

 class TwolameEncoder final : public Encoder {

--- a/src/encoder/plugins/WaveEncoderPlugin.cxx
+++ b/src/encoder/plugins/WaveEncoderPlugin.cxx
@@ -22,7 +22,8 @@
 #include "util/ByteOrder.hxx"
 #include "util/DynamicFifoBuffer.hxx"

-#include <assert.h>
+#include <cassert>
+
 #include <string.h>

 static constexpr uint16_t WAVE_FORMAT_PCM = 1;

--- a/src/event/BufferedSocket.hxx
+++ b/src/event/BufferedSocket.hxx
@@ -23,9 +23,9 @@
 #include "SocketMonitor.hxx"
 #include "util/StaticFifoBuffer.hxx"

+#include <cassert>
 #include <exception>

-#include <assert.h>
 #include <stdint.h>

 class EventLoop;

--- a/src/event/Call.cxx
+++ b/src/event/Call.cxx
@@ -23,10 +23,9 @@
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"

+#include <cassert>
 #include <exception>

-#include <assert.h>
-
 class BlockingCallMonitor final
 {
 	DeferEvent defer_event;

--- a/src/event/FullyBufferedSocket.cxx
+++ b/src/event/FullyBufferedSocket.cxx
@@ -21,7 +21,8 @@
 #include "net/SocketError.hxx"
 #include "util/Compiler.h"

-#include <assert.h>
+#include <cassert>
+
 #include <string.h>

 FullyBufferedSocket::ssize_t

--- a/src/event/IdleMonitor.cxx
+++ b/src/event/IdleMonitor.cxx
@@ -20,7 +20,7 @@
 #include "IdleMonitor.hxx"
 #include "Loop.hxx"

-#include <assert.h>
+#include <cassert>

 void
 IdleMonitor::Cancel() noexcept

--- a/src/event/Loop.hxx
+++ b/src/event/Loop.hxx
@@ -34,10 +34,9 @@
 #include <boost/intrusive/set.hpp>
 #include <boost/intrusive/list.hpp>

-#include <chrono>
 #include <atomic>
-
-#include <assert.h>
+#include <cassert>
+#include <chrono>

 /**
 * An event loop that polls for events on file/socket descriptors.

--- a/src/event/MultiSocketMonitor.hxx
+++ b/src/event/MultiSocketMonitor.hxx
@@ -24,11 +24,10 @@
 #include "TimerEvent.hxx"
 #include "SocketMonitor.hxx"

+#include <cassert>
 #include <forward_list>
 #include <iterator>

-#include <assert.h>
-
 #ifndef _WIN32
 struct pollfd;
 #endif

--- a/src/event/PollGroupPoll.cxx
+++ b/src/event/PollGroupPoll.cxx
@@ -23,7 +23,7 @@

 #include "PollGroupPoll.hxx"

-#include <assert.h>
+#include <cassert>

 PollGroupPoll::PollGroupPoll() noexcept = default;
 PollGroupPoll::~PollGroupPoll() noexcept = default;

--- a/src/event/PollGroupWinSelect.hxx
+++ b/src/event/PollGroupWinSelect.hxx
@@ -22,11 +22,11 @@

 #include "PollResultGeneric.hxx"

-#include <assert.h>
-#include <string.h>
-
+#include <cassert>
 #include <unordered_map>

+#include <string.h>
+
 #include <windows.h>
 #include <winsock2.h>


--- a/src/event/ServerSocket.cxx
+++ b/src/event/ServerSocket.cxx
@@ -35,11 +35,10 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"

+#include <cassert>
 #include <string>
 #include <utility>

-#include <assert.h>
-
 #ifdef HAVE_UN
 #include <sys/stat.h>
 #endif

--- a/src/event/SignalMonitor.cxx
+++ b/src/event/SignalMonitor.cxx
@@ -37,12 +37,12 @@
 #endif

 #include <algorithm>
+#include <cassert>

 #ifdef USE_SIGNALFD
 #include <pthread.h>
 #endif

-#include <assert.h>
 #include <signal.h>

 class SignalMonitor final : private SocketMonitor {

--- a/src/event/SocketMonitor.cxx
+++ b/src/event/SocketMonitor.cxx
@@ -20,10 +20,9 @@
 #include "SocketMonitor.hxx"
 #include "Loop.hxx"

+#include <cassert>
 #include <utility>

-#include <assert.h>
-
 void
 SocketMonitor::Dispatch(unsigned flags) noexcept
 {

--- a/src/event/SocketMonitor.hxx
+++ b/src/event/SocketMonitor.hxx
@@ -23,9 +23,9 @@
 #include "PollGroup.hxx"
 #include "net/SocketDescriptor.hxx"

+#include <cassert>
 #include <type_traits>

-#include <assert.h>
 #include <stddef.h>

 class EventLoop;

--- a/src/filter/Filter.hxx
+++ b/src/filter/Filter.hxx
@@ -22,7 +22,7 @@

 #include "pcm/AudioFormat.hxx"

-#include <assert.h>
+#include <cassert>

 template<typename T> struct ConstBuffer;


--- a/src/filter/Observer.cxx
+++ b/src/filter/Observer.cxx
@@ -22,7 +22,7 @@
 #include "Prepared.hxx"
 #include "util/ConstBuffer.hxx"

-#include <assert.h>
+#include <cassert>

 class FilterObserver::PreparedProxy final : public PreparedFilter {
 	FilterObserver &observer;

--- a/src/filter/plugins/AutoConvertFilterPlugin.cxx
+++ b/src/filter/plugins/AutoConvertFilterPlugin.cxx
@@ -24,10 +24,9 @@
 #include "pcm/AudioFormat.hxx"
 #include "util/ConstBuffer.hxx"

+#include <cassert>
 #include <memory>

-#include <assert.h>
-
 class AutoConvertFilter final : public Filter {
 	/**
 	 * The underlying filter.

--- a/src/filter/plugins/ChainFilterPlugin.cxx
+++ b/src/filter/plugins/ChainFilterPlugin.cxx
@@ -25,10 +25,9 @@
 #include "util/StringBuffer.hxx"
 #include "util/RuntimeError.hxx"

-#include <memory>
+#include <cassert>
 #include <list>
-
-#include <assert.h>
+#include <memory>

 class ChainFilter final : public Filter {
 	struct Child {

--- a/src/filter/plugins/ConvertFilterPlugin.cxx
+++ b/src/filter/plugins/ConvertFilterPlugin.cxx
@@ -24,10 +24,9 @@
 #include "pcm/Convert.hxx"
 #include "util/ConstBuffer.hxx"

+#include <cassert>
 #include <memory>

-#include <assert.h>
-
 class ConvertFilter final : public Filter {
 	/**
 	 * The input audio format; PCM data is passed to the filter()

--- a/src/filter/plugins/ReplayGainFilterPlugin.cxx
+++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx
@@ -29,10 +29,9 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"

+#include <cassert>
 #include <exception>

-#include <assert.h>
-
 static constexpr Domain replay_gain_domain("replay_gain");

 class ReplayGainFilter final : public Filter {

--- a/src/fs/Charset.cxx
+++ b/src/fs/Charset.cxx
@@ -31,8 +31,7 @@
 #endif

 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>

 #ifdef HAVE_FS_CHARSET


--- a/src/fs/Path.hxx
+++ b/src/fs/Path.hxx
@@ -23,10 +23,9 @@
 #include "util/Compiler.h"
 #include "Traits.hxx"

+#include <cassert>
 #include <string>

-#include <assert.h>
-
 class AllocatedPath;

 /**

--- a/src/fs/Traits.hxx
+++ b/src/fs/Traits.hxx
@@ -29,10 +29,9 @@
 #include <tchar.h>
 #endif

+#include <cassert>
 #include <string>

-#include <assert.h>
-
 #ifdef _WIN32
 #define PATH_LITERAL(s) _T(s)
 #else

--- a/src/fs/io/FileOutputStream.hxx
+++ b/src/fs/io/FileOutputStream.hxx
@@ -38,7 +38,8 @@
 #include "system/FileDescriptor.hxx"
 #endif

-#include <assert.h>
+#include <cassert>
+
 #include <stdint.h>

 #ifdef _WIN32

--- a/src/fs/io/FileReader.cxx
+++ b/src/fs/io/FileReader.cxx
@@ -32,7 +32,7 @@
 #include "system/Error.hxx"
 #include "system/Open.hxx"

-#include <assert.h>
+#include <cassert>

 #ifdef _WIN32


--- a/src/fs/io/PeekReader.cxx
+++ b/src/fs/io/PeekReader.cxx
@@ -20,8 +20,8 @@
 #include "PeekReader.hxx"

 #include <algorithm>
+#include <cassert>

-#include <assert.h>
 #include <string.h>

 const void *

--- a/src/fs/io/TextFile.cxx
+++ b/src/fs/io/TextFile.cxx
@@ -23,7 +23,7 @@
 #include "BufferedReader.hxx"
 #include "fs/Path.hxx"

-#include <assert.h>
+#include <cassert>

 TextFile::TextFile(Path path_fs)
 	:file_reader(std::make_unique<FileReader>(path_fs)),

--- a/src/input/AsyncInputStream.cxx
+++ b/src/input/AsyncInputStream.cxx
@@ -23,9 +23,9 @@
 #include "thread/Cond.hxx"
 #include "event/Loop.hxx"

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
 #include <string.h>

 AsyncInputStream::AsyncInputStream(EventLoop &event_loop, const char *_url,

--- a/src/input/BufferedInputStream.hxx
+++ b/src/input/BufferedInputStream.hxx
@@ -23,7 +23,7 @@
 #include "InputStream.hxx"
 #include "BufferingInputStream.hxx"

-#include <assert.h>
+#include <cassert>

 /**
 * A "huge" buffer which remembers the (partial) contents of an

--- a/src/input/Init.cxx
+++ b/src/input/Init.cxx
@@ -27,10 +27,9 @@
 #include "PluginUnavailable.hxx"
 #include "util/RuntimeError.hxx"

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
-
 void
 input_stream_global_init(const ConfigData &config, EventLoop &event_loop)
 {

--- a/src/input/InputPlugin.cxx
+++ b/src/input/InputPlugin.cxx
@@ -20,8 +20,8 @@
 #include "InputPlugin.hxx"
 #include "util/StringCompare.hxx"

-#include <assert.h>
 #include <algorithm>
+#include <cassert>
 #include <iterator>

 bool
@@ -71,4 +71,4 @@ protocol_is_whitelisted(const char *proto) {
 	return std::binary_search(begin, end, proto, [](const char* a, const char* b) {
 		return strcasecmp(a,b) < 0;
 	});
-}
\ No newline at end of file
+}
--- a/src/input/InputPlugin.hxx
+++ b/src/input/InputPlugin.hxx
@@ -23,7 +23,8 @@
 #include "Ptr.hxx"
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"
-#include <assert.h>
+
+#include <cassert>
 #include <set>
 #include <string>


--- a/src/input/InputStream.cxx
+++ b/src/input/InputStream.cxx
@@ -22,10 +22,9 @@
 #include "tag/Tag.hxx"
 #include "util/ASCII.hxx"

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
-
 InputStream::~InputStream() noexcept = default;

 void

--- a/src/input/InputStream.hxx
+++ b/src/input/InputStream.hxx
@@ -25,10 +25,9 @@
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"

-#include <string>
+#include <cassert>
 #include <memory>
-
-#include <assert.h>
+#include <string>

 struct Tag;
 class InputStreamHandler;

--- a/src/input/LocalOpen.cxx
+++ b/src/input/LocalOpen.cxx
@@ -29,7 +29,7 @@
 #include "fs/Path.hxx"
 #include "system/Error.hxx"

-#include <assert.h>
+#include <cassert>

 InputStreamPtr
 OpenLocalInputStream(Path path, Mutex &mutex)

--- a/src/input/RewindInputStream.cxx
+++ b/src/input/RewindInputStream.cxx
@@ -20,7 +20,8 @@
 #include "RewindInputStream.hxx"
 #include "ProxyInputStream.hxx"

-#include <assert.h>
+#include <cassert>
+
 #include <string.h>

 class RewindInputStream final : public ProxyInputStream {

--- a/src/input/TextInputStream.cxx
+++ b/src/input/TextInputStream.cxx
@@ -21,7 +21,7 @@
 #include "InputStream.hxx"
 #include "util/TextFile.hxx"

-#include <assert.h>
+#include <cassert>

 TextInputStream::TextInputStream(InputStreamPtr &&_is) noexcept
 	:is(std::move(_is)) {}

--- a/src/input/ThreadInputStream.cxx
+++ b/src/input/ThreadInputStream.cxx
--- a/src/input/ThreadInputStream.hxx
+++ b/src/input/ThreadInputStream.hxx
--- a/src/input/cache/Item.cxx
+++ b/src/input/cache/Item.cxx
--- a/src/input/plugins/AlsaInputPlugin.cxx
+++ b/src/input/plugins/AlsaInputPlugin.cxx
--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
--- a/src/input/plugins/QobuzClient.cxx
+++ b/src/input/plugins/QobuzClient.cxx
--- a/src/java/Class.hxx
+++ b/src/java/Class.hxx
--- a/src/java/Object.hxx
+++ b/src/java/Object.hxx
--- a/src/java/Ref.hxx
+++ b/src/java/Ref.hxx
--- a/src/lib/alsa/Format.hxx
+++ b/src/lib/alsa/Format.hxx
--- a/src/lib/alsa/PeriodBuffer.hxx
+++ b/src/lib/alsa/PeriodBuffer.hxx
--- a/src/lib/curl/Delegate.cxx
+++ b/src/lib/curl/Delegate.cxx
--- a/src/lib/curl/Global.cxx
+++ b/src/lib/curl/Global.cxx
--- a/src/lib/curl/Init.cxx
+++ b/src/lib/curl/Init.cxx
--- a/src/lib/curl/Request.cxx
+++ b/src/lib/curl/Request.cxx
--- a/src/lib/dbus/AsyncRequest.hxx
+++ b/src/lib/dbus/AsyncRequest.hxx
--- a/src/lib/ffmpeg/Time.hxx
+++ b/src/lib/ffmpeg/Time.hxx
--- a/src/lib/icu/CaseFold.cxx
+++ b/src/lib/icu/CaseFold.cxx
--- a/src/lib/icu/Collate.cxx
+++ b/src/lib/icu/Collate.cxx
--- a/src/lib/icu/Util.cxx
+++ b/src/lib/icu/Util.cxx
--- a/src/lib/nfs/Base.cxx
+++ b/src/lib/nfs/Base.cxx
--- a/src/lib/nfs/Cancellable.hxx
+++ b/src/lib/nfs/Cancellable.hxx
--- a/src/lib/nfs/Error.cxx
+++ b/src/lib/nfs/Error.cxx
--- a/src/lib/nfs/FileReader.cxx
+++ b/src/lib/nfs/FileReader.cxx
--- a/src/lib/nfs/Glue.cxx
+++ b/src/lib/nfs/Glue.cxx
--- a/src/lib/sqlite/Util.hxx
+++ b/src/lib/sqlite/Util.hxx
--- a/src/lib/upnp/ClientInit.cxx
+++ b/src/lib/upnp/ClientInit.cxx
--- a/src/lib/upnp/Init.cxx
+++ b/src/lib/upnp/Init.cxx
--- a/src/lib/xiph/FlacStreamMetadata.cxx
+++ b/src/lib/xiph/FlacStreamMetadata.cxx
--- a/src/lib/xiph/OggPage.hxx
+++ b/src/lib/xiph/OggPage.hxx
--- a/src/lib/xiph/OggStreamState.hxx
+++ b/src/lib/xiph/OggStreamState.hxx
--- a/src/ls.cxx
+++ b/src/ls.cxx
--- a/src/mixer/MixerAll.cxx
+++ b/src/mixer/MixerAll.cxx
--- a/src/mixer/MixerControl.cxx
+++ b/src/mixer/MixerControl.cxx
--- a/src/mixer/MixerType.cxx
+++ b/src/mixer/MixerType.cxx
--- a/src/mixer/Volume.cxx
+++ b/src/mixer/Volume.cxx
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
--- a/src/mixer/plugins/PulseMixerPlugin.cxx
+++ b/src/mixer/plugins/PulseMixerPlugin.cxx
--- a/src/mixer/plugins/SoftwareMixerPlugin.cxx
+++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx
--- a/src/mixer/plugins/WinmmMixerPlugin.cxx
+++ b/src/mixer/plugins/WinmmMixerPlugin.cxx
--- a/src/net/AddressInfo.cxx
+++ b/src/net/AddressInfo.cxx
--- a/src/net/IPv4Address.cxx
+++ b/src/net/IPv4Address.cxx
--- a/src/net/IPv6Address.cxx
+++ b/src/net/IPv6Address.cxx
--- a/src/net/SocketAddress.cxx
+++ b/src/net/SocketAddress.cxx
--- a/src/net/StaticSocketAddress.hxx
+++ b/src/net/StaticSocketAddress.hxx
--- a/src/net/ToString.cxx
+++ b/src/net/ToString.cxx
--- a/src/output/Control.cxx
+++ b/src/output/Control.cxx
--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
--- a/src/output/MultipleOutputs.cxx
+++ b/src/output/MultipleOutputs.cxx
--- a/src/output/MultipleOutputs.hxx
+++ b/src/output/MultipleOutputs.hxx
--- a/src/output/OutputPlugin.cxx
+++ b/src/output/OutputPlugin.cxx
--- a/src/output/SharedPipeConsumer.hxx
+++ b/src/output/SharedPipeConsumer.hxx
--- a/src/output/Source.hxx
+++ b/src/output/Source.hxx
--- a/src/output/Thread.cxx
+++ b/src/output/Thread.cxx
--- a/src/output/Timer.cxx
+++ b/src/output/Timer.cxx
--- a/src/output/plugins/JackOutputPlugin.cxx
+++ b/src/output/plugins/JackOutputPlugin.cxx
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
--- a/src/output/plugins/PulseOutputPlugin.cxx
+++ b/src/output/plugins/PulseOutputPlugin.cxx
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
--- a/src/output/plugins/ShoutOutputPlugin.cxx
+++ b/src/output/plugins/ShoutOutputPlugin.cxx
--- a/src/output/plugins/httpd/HttpdClient.cxx
+++ b/src/output/plugins/httpd/HttpdClient.cxx
--- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
--- a/src/pcm/AudioFormat.cxx
+++ b/src/pcm/AudioFormat.cxx
--- a/src/pcm/AudioParser.cxx
+++ b/src/pcm/AudioParser.cxx
--- a/src/pcm/ChannelsConverter.cxx
+++ b/src/pcm/ChannelsConverter.cxx
--- a/src/pcm/ChannelsConverter.hxx
+++ b/src/pcm/ChannelsConverter.hxx
--- a/src/pcm/ConfiguredResampler.cxx
+++ b/src/pcm/ConfiguredResampler.cxx
--- a/src/pcm/Convert.cxx
+++ b/src/pcm/Convert.cxx
--- a/src/pcm/Dop.cxx
+++ b/src/pcm/Dop.cxx
--- a/src/pcm/Dsd2Pcm.cxx
+++ b/src/pcm/Dsd2Pcm.cxx
--- a/src/pcm/Export.cxx
+++ b/src/pcm/Export.cxx
--- a/src/pcm/FallbackResampler.cxx
+++ b/src/pcm/FallbackResampler.cxx
--- a/src/pcm/FormatConverter.cxx
+++ b/src/pcm/FormatConverter.cxx
--- a/src/pcm/FormatConverter.hxx
+++ b/src/pcm/FormatConverter.hxx
--- a/src/pcm/GlueResampler.cxx
+++ b/src/pcm/GlueResampler.cxx
--- a/src/pcm/LibsamplerateResampler.cxx
+++ b/src/pcm/LibsamplerateResampler.cxx
--- a/src/pcm/Mix.cxx
+++ b/src/pcm/Mix.cxx
--- a/src/pcm/PcmChannels.cxx
+++ b/src/pcm/PcmChannels.cxx
--- a/src/pcm/PcmDsd.cxx
+++ b/src/pcm/PcmDsd.cxx
--- a/src/pcm/RestBuffer.hxx
+++ b/src/pcm/RestBuffer.hxx
--- a/src/pcm/SampleFormat.cxx
+++ b/src/pcm/SampleFormat.cxx
--- a/src/pcm/SoxrResampler.cxx
+++ b/src/pcm/SoxrResampler.cxx
--- a/src/pcm/Volume.cxx
+++ b/src/pcm/Volume.cxx
--- a/src/pcm/Volume.hxx
+++ b/src/pcm/Volume.hxx
--- a/src/player/Control.cxx
+++ b/src/player/Control.cxx
--- a/src/player/CrossFade.cxx
+++ b/src/player/CrossFade.cxx
--- a/src/playlist/PlaylistMapper.cxx
+++ b/src/playlist/PlaylistMapper.cxx
--- a/src/playlist/PlaylistRegistry.cxx
+++ b/src/playlist/PlaylistRegistry.cxx
--- a/src/playlist/PlaylistStream.cxx
+++ b/src/playlist/PlaylistStream.cxx
--- a/src/playlist/cue/CueParser.cxx
+++ b/src/playlist/cue/CueParser.cxx
--- a/src/queue/IdTable.hxx
+++ b/src/queue/IdTable.hxx
--- a/src/queue/Playlist.cxx
+++ b/src/queue/Playlist.cxx
--- a/src/queue/Queue.hxx
+++ b/src/queue/Queue.hxx
--- a/src/song/Filter.cxx
+++ b/src/song/Filter.cxx
--- a/src/song/StringFilter.cxx
+++ b/src/song/StringFilter.cxx
--- a/src/sticker/Database.cxx
+++ b/src/sticker/Database.cxx
--- a/src/storage/MemoryDirectoryReader.cxx
+++ b/src/storage/MemoryDirectoryReader.cxx
--- a/src/storage/plugins/CurlStorage.cxx
+++ b/src/storage/plugins/CurlStorage.cxx
--- a/src/storage/plugins/NfsStorage.cxx
+++ b/src/storage/plugins/NfsStorage.cxx
--- a/src/system/EventFD.cxx
+++ b/src/system/EventFD.cxx
--- a/src/system/EventPipe.cxx
+++ b/src/system/EventPipe.cxx
--- a/src/system/FileDescriptor.cxx
+++ b/src/system/FileDescriptor.cxx
--- a/src/system/SignalFD.cxx
+++ b/src/system/SignalFD.cxx
--- a/src/system/UniqueFileDescriptor.hxx
+++ b/src/system/UniqueFileDescriptor.hxx
--- a/src/tag/ApeLoader.cxx
+++ b/src/tag/ApeLoader.cxx
--- a/src/tag/Builder.cxx
+++ b/src/tag/Builder.cxx
--- a/src/tag/FixString.cxx
+++ b/src/tag/FixString.cxx
--- a/src/tag/MixRamp.cxx
+++ b/src/tag/MixRamp.cxx
--- a/src/tag/ParseName.cxx
+++ b/src/tag/ParseName.cxx
--- a/src/tag/Pool.cxx
+++ b/src/tag/Pool.cxx
--- a/src/tag/ReplayGain.cxx
+++ b/src/tag/ReplayGain.cxx
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
--- a/src/tag/VorbisComment.cxx
+++ b/src/tag/VorbisComment.cxx
--- a/src/thread/Thread.hxx
+++ b/src/thread/Thread.hxx
--- a/src/time/ISO8601.cxx
+++ b/src/time/ISO8601.cxx
--- a/src/time/Parser.cxx
+++ b/src/time/Parser.cxx
--- a/src/unix/PidFile.hxx
+++ b/src/unix/PidFile.hxx
--- a/src/util/ASCII.hxx
+++ b/src/util/ASCII.hxx
--- a/src/util/AllocatedArray.hxx
+++ b/src/util/AllocatedArray.hxx
--- a/src/util/ByteReverse.cxx
+++ b/src/util/ByteReverse.cxx
--- a/src/util/CircularBuffer.hxx
+++ b/src/util/CircularBuffer.hxx
--- a/src/util/ConstBuffer.hxx
+++ b/src/util/ConstBuffer.hxx
--- a/src/util/DivideString.hxx
+++ b/src/util/DivideString.hxx
--- a/src/util/ForeignFifoBuffer.hxx
+++ b/src/util/ForeignFifoBuffer.hxx
--- a/src/util/LazyRandomEngine.hxx
+++ b/src/util/LazyRandomEngine.hxx
--- a/src/util/Manual.hxx
+++ b/src/util/Manual.hxx
--- a/src/util/NumberParser.hxx
+++ b/src/util/NumberParser.hxx
--- a/src/util/OptionDef.hxx
+++ b/src/util/OptionDef.hxx
--- a/src/util/PeakBuffer.cxx
+++ b/src/util/PeakBuffer.cxx
--- a/src/util/SliceBuffer.hxx
+++ b/src/util/SliceBuffer.hxx
--- a/src/util/SparseBuffer.hxx
+++ b/src/util/SparseBuffer.hxx
--- a/src/util/StaticFifoBuffer.hxx
+++ b/src/util/StaticFifoBuffer.hxx
--- a/src/util/StringUtil.cxx
+++ b/src/util/StringUtil.cxx
--- a/src/util/UriRelative.cxx
+++ b/src/util/UriRelative.cxx
--- a/src/util/UriUtil.cxx
+++ b/src/util/UriUtil.cxx
--- a/src/util/WritableBuffer.hxx
+++ b/src/util/WritableBuffer.hxx
--- a/test/ContainerScan.cxx
+++ b/test/ContainerScan.cxx
--- a/test/RunChromaprint.cxx
+++ b/test/RunChromaprint.cxx
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
--- a/test/read_tags.cxx
+++ b/test/read_tags.cxx
--- a/test/run_convert.cxx
+++ b/test/run_convert.cxx
--- a/test/run_decoder.cxx
+++ b/test/run_decoder.cxx
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
--- a/test/test_vorbis_encoder.cxx
+++ b/test/test_vorbis_encoder.cxx