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: 's avatarRosen Penev <rosenp@gmail.com>
parent a718086f
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#include <string.h> #include <string.h>
#ifdef HAVE_ICU_CONVERTER #ifdef HAVE_ICU_CONVERTER
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "Main.hxx" #include "Main.hxx"
#include "Instance.hxx" #include "Instance.hxx"
#include <assert.h> #include <cassert>
void void
idle_add(unsigned flags) idle_add(unsigned flags)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "IdleFlags.hxx" #include "IdleFlags.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include <assert.h> #include <cassert>
static const char *const idle_names[] = { static const char *const idle_names[] = {
"database", "database",
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include "util/StringStrip.hxx" #include "util/StringStrip.hxx"
#include "config.h" #include "config.h"
#include <assert.h> #include <cassert>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
......
...@@ -30,11 +30,12 @@ ...@@ -30,11 +30,12 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include <cassert>
#ifdef ENABLE_SYSTEMD_DAEMON #ifdef ENABLE_SYSTEMD_DAEMON
#include <systemd/sd-daemon.h> #include <systemd/sd-daemon.h>
#endif #endif
#include <assert.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Main.hxx" #include "Main.hxx"
#endif #endif
#include <assert.h> #include <cassert>
/** /**
* The absolute path of the playlist directory encoded in the * The absolute path of the playlist directory encoded in the
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "MusicBuffer.hxx" #include "MusicBuffer.hxx"
#include "MusicChunk.hxx" #include "MusicChunk.hxx"
#include <assert.h> #include <cassert>
MusicBuffer::MusicBuffer(unsigned num_chunks) MusicBuffer::MusicBuffer(unsigned num_chunks)
:buffer(num_chunks) { :buffer(num_chunks) {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include <assert.h> #include <cassert>
MusicChunkInfo::MusicChunkInfo() noexcept = default; MusicChunkInfo::MusicChunkInfo() noexcept = default;
MusicChunkInfo::~MusicChunkInfo() noexcept = default; MusicChunkInfo::~MusicChunkInfo() noexcept = default;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "MusicPipe.hxx" #include "MusicPipe.hxx"
#include "MusicChunk.hxx" #include "MusicChunk.hxx"
#include <assert.h> #include <cassert>
#ifndef NDEBUG #ifndef NDEBUG
......
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <cassert>
#include <map> #include <map>
#include <string> #include <string>
#include <utility> #include <utility>
#include <assert.h>
#include <string.h> #include <string.h>
static constexpr char PERMISSION_PASSWORD_CHAR = '@'; static constexpr char PERMISSION_PASSWORD_CHAR = '@';
......
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static const char PLAYLIST_COMMENT = '#'; static const char PLAYLIST_COMMENT = '#';
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include "ReplayGainConfig.hxx" #include "ReplayGainConfig.hxx"
#include "config/Data.hxx" #include "config/Data.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include "ReplayGainMode.hxx" #include "ReplayGainMode.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
const char * const char *
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include "SingleMode.hxx" #include "SingleMode.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
const char * const char *
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "PlaylistError.hxx" #include "PlaylistError.hxx"
#include "config.h" #include "config.h"
#include <assert.h> #include <cassert>
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
......
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
#include "TagArchive.hxx" #include "TagArchive.hxx"
#endif #endif
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "input/LocalOpen.hxx" #include "input/LocalOpen.hxx"
#include <assert.h> #include <cassert>
class TagFileScan { class TagFileScan {
const Path path_fs; const Path path_fs;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include <assert.h> #include <cassert>
/** /**
* Does the #DecoderPlugin support either the suffix or the MIME type? * Does the #DecoderPlugin support either the suffix or the MIME type?
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include "plugins/Iso9660ArchivePlugin.hxx" #include "plugins/Iso9660ArchivePlugin.hxx"
#include "plugins/ZzipArchivePlugin.hxx" #include "plugins/ZzipArchivePlugin.hxx"
#include <cassert>
#include <iterator> #include <iterator>
#include <assert.h>
#include <string.h> #include <string.h>
const ArchivePlugin *const archive_plugins[] = { const ArchivePlugin *const archive_plugins[] = {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "ArchiveFile.hxx" #include "ArchiveFile.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include <assert.h> #include <cassert>
std::unique_ptr<ArchiveFile> std::unique_ptr<ArchiveFile>
archive_file_open(const ArchivePlugin *plugin, Path path) archive_file_open(const ArchivePlugin *plugin, Path path)
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "Response.hxx" #include "Response.hxx"
#include "Idle.hxx" #include "Idle.hxx"
#include <assert.h> #include <cassert>
static void static void
WriteIdleResponse(Response &r, unsigned flags) noexcept WriteIdleResponse(Response &r, unsigned flags) noexcept
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "List.hxx" #include "List.hxx"
#include "util/DeleteDisposer.hxx" #include "util/DeleteDisposer.hxx"
#include <assert.h> #include <cassert>
ClientList::~ClientList() noexcept ClientList::~ClientList() noexcept
{ {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "net/ToString.hxx" #include "net/ToString.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n"; static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "Partition.hxx" #include "Partition.hxx"
#include "IdleFlags.hxx" #include "IdleFlags.hxx"
#include <assert.h> #include <cassert>
Client::SubscribeResult Client::SubscribeResult
Client::Subscribe(const char *channel) noexcept Client::Subscribe(const char *channel) noexcept
......
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
#include "StickerCommands.hxx" #include "StickerCommands.hxx"
#endif #endif
#include <cassert>
#include <iterator> #include <iterator>
#include <assert.h>
#include <string.h> #include <string.h>
/* /*
......
...@@ -20,11 +20,10 @@ ...@@ -20,11 +20,10 @@
#ifndef MPD_COMMAND_LIST_BUILDER_HXX #ifndef MPD_COMMAND_LIST_BUILDER_HXX
#define MPD_COMMAND_LIST_BUILDER_HXX #define MPD_COMMAND_LIST_BUILDER_HXX
#include <cassert>
#include <list> #include <list>
#include <string> #include <string>
#include <assert.h>
class CommandListBuilder { class CommandListBuilder {
/** /**
* print OK after each command execution * print OK after each command execution
......
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
#include <inttypes.h> /* for PRIu64 */ #include <inttypes.h> /* for PRIu64 */
gcc_pure gcc_pure
......
...@@ -25,11 +25,10 @@ ...@@ -25,11 +25,10 @@
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "Partition.hxx" #include "Partition.hxx"
#include <cassert>
#include <set> #include <set>
#include <string> #include <string>
#include <assert.h>
CommandResult CommandResult
handle_subscribe(Client &client, Request args, Response &r) handle_subscribe(Client &client, Request args, Response &r)
{ {
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#include "db/update/Service.hxx" #include "db/update/Service.hxx"
#endif #endif
#include <assert.h> #include <cassert>
static void static void
print_spl_list(Response &r, const PlaylistVector &list) print_spl_list(Response &r, const PlaylistVector &list)
......
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include "Chrono.hxx" #include "Chrono.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
class Response; class Response;
class Request : public ConstBuffer<const char *> { class Request : public ConstBuffer<const char *> {
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "fs/io/BufferedReader.hxx" #include "fs/io/BufferedReader.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
static constexpr char CONF_COMMENT = '#'; static constexpr char CONF_COMMENT = '#';
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include "fs/StandardDirectory.hxx" #include "fs/StandardDirectory.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#ifndef _WIN32 #ifndef _WIN32
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
extern Mutex db_mutex; extern Mutex db_mutex;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include "util/UriRelative.hxx" #include "util/UriRelative.hxx"
#include <assert.h> #include <cassert>
DetachedSong DetachedSong
DatabaseDetachSong(const Storage *storage, const LightSong &song) noexcept DatabaseDetachSong(const Storage *storage, const LightSong &song) noexcept
......
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
#include "db/DatabaseLock.hxx" #include "db/DatabaseLock.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
PlaylistVector::iterator PlaylistVector::iterator
PlaylistVector::find(const char *name) noexcept PlaylistVector::find(const char *name) noexcept
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "song/Filter.hxx" #include "song/Filter.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
......
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
#include "util/Alloc.hxx" #include "util/Alloc.hxx"
#include "util/DeleteDisposer.hxx" #include "util/DeleteDisposer.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
#include "util/RecursiveMap.hxx" #include "util/RecursiveMap.hxx"
#include "util/SplitString.hxx" #include "util/SplitString.hxx"
#include <cassert>
#include <string> #include <string>
#include <utility> #include <utility>
#include <assert.h>
#include <string.h> #include <string.h>
static const char *const rootid = "0"; static const char *const rootid = "0";
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "db/plugins/simple/Directory.hxx" #include "db/plugins/simple/Directory.hxx"
#include "db/plugins/simple/Song.hxx" #include "db/plugins/simple/Song.hxx"
#include <assert.h> #include <cassert>
void void
DatabaseEditor::DeleteSong(Directory &dir, Song *del) DatabaseEditor::DeleteSong(Directory &dir, Song *del)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "util/StringStrip.hxx" #include "util/StringStrip.hxx"
#include "config.h" #include "config.h"
#include <assert.h> #include <cassert>
#ifdef HAVE_CLASS_GLOB #ifdef HAVE_CLASS_GLOB
......
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <string> #include <cassert>
#include <map>
#include <forward_list> #include <forward_list>
#include <map>
#include <string>
#include <assert.h>
#include <sys/inotify.h> #include <sys/inotify.h>
#include <string.h> #include <string.h>
#include <dirent.h> #include <dirent.h>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "event/Loop.hxx" #include "event/Loop.hxx"
#endif #endif
#include <assert.h> #include <cassert>
UpdateService::UpdateService(const ConfigData &_config, UpdateService::UpdateService(const ConfigData &_config,
EventLoop &_loop, SimpleDatabase &_db, EventLoop &_loop, SimpleDatabase &_db,
......
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <memory> #include <memory>
#include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
......
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
......
...@@ -21,10 +21,9 @@ ...@@ -21,10 +21,9 @@
#include "MusicPipe.hxx" #include "MusicPipe.hxx"
#include "song/DetachedSong.hxx" #include "song/DetachedSong.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
DecoderControl::DecoderControl(Mutex &_mutex, Cond &_client_cond, DecoderControl::DecoderControl(Mutex &_mutex, Cond &_client_cond,
InputCacheManager *_input_cache, InputCacheManager *_input_cache,
const AudioFormat _configured_audio_format, const AudioFormat _configured_audio_format,
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
#include "ReplayGainConfig.hxx" #include "ReplayGainConfig.hxx"
#include "ReplayGainMode.hxx" #include "ReplayGainMode.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <utility>
#include <memory> #include <memory>
#include <utility>
#include <assert.h>
#include <stdint.h> #include <stdint.h>
/* damn you, windows.h! */ /* damn you, windows.h! */
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
size_t size_t
decoder_read(DecoderClient *client, decoder_read(DecoderClient *client,
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "DecoderPlugin.hxx" #include "DecoderPlugin.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include <assert.h> #include <cassert>
bool bool
DecoderPlugin::SupportsSuffix(const char *suffix) const noexcept DecoderPlugin::SupportsSuffix(const char *suffix) const noexcept
......
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
#include "DecoderPlugin.hxx" #include "DecoderPlugin.hxx"
#include "client/Response.hxx" #include "client/Response.hxx"
#include <cassert>
#include <functional> #include <functional>
#include <assert.h>
static void static void
decoder_plugin_print(Response &r, decoder_plugin_print(Response &r,
const DecoderPlugin &plugin) const DecoderPlugin &plugin)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <adplug/adplug.h> #include <adplug/adplug.h>
#include <adplug/emuopl.h> #include <adplug/emuopl.h>
#include <assert.h> #include <cassert>
static constexpr Domain adplug_domain("adplug"); static constexpr Domain adplug_domain("adplug");
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
#include <audiofile.h> #include <audiofile.h>
#include <af_vfs.h> #include <af_vfs.h>
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#include <neaacdec.h> #include <neaacdec.h>
#include <cassert>
#include <cmath> #include <cmath>
#include <assert.h>
#include <string.h> #include <string.h>
static const unsigned adts_sample_rates[] = static const unsigned adts_sample_rates[] =
......
...@@ -52,7 +52,8 @@ extern "C" { ...@@ -52,7 +52,8 @@ extern "C" {
#include <libavutil/frame.h> #include <libavutil/frame.h>
} }
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
/** /**
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <assert.h> #include <cassert>
void void
FlacPcmImport::Open(unsigned sample_rate, unsigned bits_per_sample, FlacPcmImport::Open(unsigned sample_rate, unsigned bits_per_sample,
......
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
#include <FLAC/stream_decoder.h> #include <FLAC/stream_decoder.h>
#include <utility> #include <cassert>
#include <stdexcept> #include <stdexcept>
#include <utility>
#include <assert.h>
/** /**
* OO wrapper for a FLAC__StreamDecoder. * OO wrapper for a FLAC__StreamDecoder.
......
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
#include <gme/gme.h> #include <gme/gme.h>
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
......
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
#include <id3tag.h> #include <id3tag.h>
#endif #endif
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <mikmod.h> #include <mikmod.h>
#include <assert.h> #include <cassert>
static constexpr Domain mikmod_domain("mikmod"); static constexpr Domain mikmod_domain("mikmod");
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
#include <libmodplug/modplug.h> #include <libmodplug/modplug.h>
#include <cassert>
#include <assert.h>
static constexpr Domain modplug_domain("modplug"); static constexpr Domain modplug_domain("modplug");
......
...@@ -31,13 +31,11 @@ ...@@ -31,13 +31,11 @@
#include <wavpack/wavpack.h> #include <wavpack/wavpack.h>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <cstdlib>
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#include <cstdlib>
#include <assert.h>
#define ERRORLEN 80 #define ERRORLEN 80
#ifdef OPEN_DSD_AS_PCM #ifdef OPEN_DSD_AS_PCM
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include "EncoderPlugin.hxx" #include "EncoderPlugin.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
#include <stddef.h> #include <stddef.h>
struct AudioFormat; struct AudioFormat;
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#include <lame/lame.h> #include <lame/lame.h>
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
class LameEncoder final : public Encoder { class LameEncoder final : public Encoder {
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#include <opus.h> #include <opus.h>
#include <ogg/ogg.h> #include <ogg/ogg.h>
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
namespace { namespace {
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
#include <twolame.h> #include <twolame.h>
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
class TwolameEncoder final : public Encoder { class TwolameEncoder final : public Encoder {
......
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "util/DynamicFifoBuffer.hxx" #include "util/DynamicFifoBuffer.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static constexpr uint16_t WAVE_FORMAT_PCM = 1; static constexpr uint16_t WAVE_FORMAT_PCM = 1;
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "SocketMonitor.hxx" #include "SocketMonitor.hxx"
#include "util/StaticFifoBuffer.hxx" #include "util/StaticFifoBuffer.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
#include <stdint.h> #include <stdint.h>
class EventLoop; class EventLoop;
......
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
class BlockingCallMonitor final class BlockingCallMonitor final
{ {
DeferEvent defer_event; DeferEvent defer_event;
......
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
#include "net/SocketError.hxx" #include "net/SocketError.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
FullyBufferedSocket::ssize_t FullyBufferedSocket::ssize_t
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "IdleMonitor.hxx" #include "IdleMonitor.hxx"
#include "Loop.hxx" #include "Loop.hxx"
#include <assert.h> #include <cassert>
void void
IdleMonitor::Cancel() noexcept IdleMonitor::Cancel() noexcept
......
...@@ -34,10 +34,9 @@ ...@@ -34,10 +34,9 @@
#include <boost/intrusive/set.hpp> #include <boost/intrusive/set.hpp>
#include <boost/intrusive/list.hpp> #include <boost/intrusive/list.hpp>
#include <chrono>
#include <atomic> #include <atomic>
#include <cassert>
#include <assert.h> #include <chrono>
/** /**
* An event loop that polls for events on file/socket descriptors. * An event loop that polls for events on file/socket descriptors.
......
...@@ -24,11 +24,10 @@ ...@@ -24,11 +24,10 @@
#include "TimerEvent.hxx" #include "TimerEvent.hxx"
#include "SocketMonitor.hxx" #include "SocketMonitor.hxx"
#include <cassert>
#include <forward_list> #include <forward_list>
#include <iterator> #include <iterator>
#include <assert.h>
#ifndef _WIN32 #ifndef _WIN32
struct pollfd; struct pollfd;
#endif #endif
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "PollGroupPoll.hxx" #include "PollGroupPoll.hxx"
#include <assert.h> #include <cassert>
PollGroupPoll::PollGroupPoll() noexcept = default; PollGroupPoll::PollGroupPoll() noexcept = default;
PollGroupPoll::~PollGroupPoll() noexcept = default; PollGroupPoll::~PollGroupPoll() noexcept = default;
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
#include "PollResultGeneric.hxx" #include "PollResultGeneric.hxx"
#include <assert.h> #include <cassert>
#include <string.h>
#include <unordered_map> #include <unordered_map>
#include <string.h>
#include <windows.h> #include <windows.h>
#include <winsock2.h> #include <winsock2.h>
......
...@@ -35,11 +35,10 @@ ...@@ -35,11 +35,10 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <string> #include <string>
#include <utility> #include <utility>
#include <assert.h>
#ifdef HAVE_UN #ifdef HAVE_UN
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
......
...@@ -37,12 +37,12 @@ ...@@ -37,12 +37,12 @@
#endif #endif
#include <algorithm> #include <algorithm>
#include <cassert>
#ifdef USE_SIGNALFD #ifdef USE_SIGNALFD
#include <pthread.h> #include <pthread.h>
#endif #endif
#include <assert.h>
#include <signal.h> #include <signal.h>
class SignalMonitor final : private SocketMonitor { class SignalMonitor final : private SocketMonitor {
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "SocketMonitor.hxx" #include "SocketMonitor.hxx"
#include "Loop.hxx" #include "Loop.hxx"
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
void void
SocketMonitor::Dispatch(unsigned flags) noexcept SocketMonitor::Dispatch(unsigned flags) noexcept
{ {
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "PollGroup.hxx" #include "PollGroup.hxx"
#include "net/SocketDescriptor.hxx" #include "net/SocketDescriptor.hxx"
#include <cassert>
#include <type_traits> #include <type_traits>
#include <assert.h>
#include <stddef.h> #include <stddef.h>
class EventLoop; class EventLoop;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include <assert.h> #include <cassert>
template<typename T> struct ConstBuffer; template<typename T> struct ConstBuffer;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "Prepared.hxx" #include "Prepared.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <assert.h> #include <cassert>
class FilterObserver::PreparedProxy final : public PreparedFilter { class FilterObserver::PreparedProxy final : public PreparedFilter {
FilterObserver &observer; FilterObserver &observer;
......
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <cassert>
#include <memory> #include <memory>
#include <assert.h>
class AutoConvertFilter final : public Filter { class AutoConvertFilter final : public Filter {
/** /**
* The underlying filter. * The underlying filter.
......
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <memory> #include <cassert>
#include <list> #include <list>
#include <memory>
#include <assert.h>
class ChainFilter final : public Filter { class ChainFilter final : public Filter {
struct Child { struct Child {
......
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
#include "pcm/Convert.hxx" #include "pcm/Convert.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <cassert>
#include <memory> #include <memory>
#include <assert.h>
class ConvertFilter final : public Filter { class ConvertFilter final : public Filter {
/** /**
* The input audio format; PCM data is passed to the filter() * The input audio format; PCM data is passed to the filter()
......
...@@ -29,10 +29,9 @@ ...@@ -29,10 +29,9 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
static constexpr Domain replay_gain_domain("replay_gain"); static constexpr Domain replay_gain_domain("replay_gain");
class ReplayGainFilter final : public Filter { class ReplayGainFilter final : public Filter {
......
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
#endif #endif
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#ifdef HAVE_FS_CHARSET #ifdef HAVE_FS_CHARSET
......
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
#include "util/Compiler.h" #include "util/Compiler.h"
#include "Traits.hxx" #include "Traits.hxx"
#include <cassert>
#include <string> #include <string>
#include <assert.h>
class AllocatedPath; class AllocatedPath;
/** /**
......
...@@ -29,10 +29,9 @@ ...@@ -29,10 +29,9 @@
#include <tchar.h> #include <tchar.h>
#endif #endif
#include <cassert>
#include <string> #include <string>
#include <assert.h>
#ifdef _WIN32 #ifdef _WIN32
#define PATH_LITERAL(s) _T(s) #define PATH_LITERAL(s) _T(s)
#else #else
......
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
#include "system/FileDescriptor.hxx" #include "system/FileDescriptor.hxx"
#endif #endif
#include <assert.h> #include <cassert>
#include <stdint.h> #include <stdint.h>
#ifdef _WIN32 #ifdef _WIN32
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "system/Error.hxx" #include "system/Error.hxx"
#include "system/Open.hxx" #include "system/Open.hxx"
#include <assert.h> #include <cassert>
#ifdef _WIN32 #ifdef _WIN32
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "PeekReader.hxx" #include "PeekReader.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#include <string.h> #include <string.h>
const void * const void *
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "BufferedReader.hxx" #include "BufferedReader.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include <assert.h> #include <cassert>
TextFile::TextFile(Path path_fs) TextFile::TextFile(Path path_fs)
:file_reader(std::make_unique<FileReader>(path_fs)), :file_reader(std::make_unique<FileReader>(path_fs)),
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include "event/Loop.hxx" #include "event/Loop.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
AsyncInputStream::AsyncInputStream(EventLoop &event_loop, const char *_url, AsyncInputStream::AsyncInputStream(EventLoop &event_loop, const char *_url,
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "InputStream.hxx" #include "InputStream.hxx"
#include "BufferingInputStream.hxx" #include "BufferingInputStream.hxx"
#include <assert.h> #include <cassert>
/** /**
* A "huge" buffer which remembers the (partial) contents of an * A "huge" buffer which remembers the (partial) contents of an
......
...@@ -27,10 +27,9 @@ ...@@ -27,10 +27,9 @@
#include "PluginUnavailable.hxx" #include "PluginUnavailable.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
void void
input_stream_global_init(const ConfigData &config, EventLoop &event_loop) input_stream_global_init(const ConfigData &config, EventLoop &event_loop)
{ {
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "InputPlugin.hxx" #include "InputPlugin.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include <assert.h>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <iterator> #include <iterator>
bool bool
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include "Ptr.hxx" #include "Ptr.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h>
#include <cassert>
#include <set> #include <set>
#include <string> #include <string>
......
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
InputStream::~InputStream() noexcept = default; InputStream::~InputStream() noexcept = default;
void void
......
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <string> #include <cassert>
#include <memory> #include <memory>
#include <string>
#include <assert.h>
struct Tag; struct Tag;
class InputStreamHandler; class InputStreamHandler;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include <assert.h> #include <cassert>
InputStreamPtr InputStreamPtr
OpenLocalInputStream(Path path, Mutex &mutex) OpenLocalInputStream(Path path, Mutex &mutex)
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
#include "RewindInputStream.hxx" #include "RewindInputStream.hxx"
#include "ProxyInputStream.hxx" #include "ProxyInputStream.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
class RewindInputStream final : public ProxyInputStream { class RewindInputStream final : public ProxyInputStream {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "InputStream.hxx" #include "InputStream.hxx"
#include "util/TextFile.hxx" #include "util/TextFile.hxx"
#include <assert.h> #include <cassert>
TextInputStream::TextInputStream(InputStreamPtr &&_is) noexcept TextInputStream::TextInputStream(InputStreamPtr &&_is) noexcept
:is(std::move(_is)) {} :is(std::move(_is)) {}
......
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
#include "CondHandler.hxx" #include "CondHandler.hxx"
#include "thread/Name.hxx" #include "thread/Name.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
ThreadInputStream::ThreadInputStream(const char *_plugin, ThreadInputStream::ThreadInputStream(const char *_plugin,
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#include "util/HugeAllocator.hxx" #include "util/HugeAllocator.hxx"
#include "util/CircularBuffer.hxx" #include "util/CircularBuffer.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
#include <stdint.h> #include <stdint.h>
/** /**
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "Lease.hxx" #include "Lease.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include <assert.h> #include <cassert>
InputCacheItem::InputCacheItem(InputStreamPtr _input) noexcept InputCacheItem::InputCacheItem(InputStreamPtr _input) noexcept
:BufferingInputStream(std::move(_input)), :BufferingInputStream(std::move(_input)),
......
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static constexpr Domain alsa_input_domain("alsa"); static constexpr Domain alsa_input_domain("alsa");
......
...@@ -34,11 +34,12 @@ ...@@ -34,11 +34,12 @@
#include "Log.hxx" #include "Log.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include <cassert>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h>
#include <cdio/cd_types.h> #include <cdio/cd_types.h>
......
...@@ -49,9 +49,9 @@ ...@@ -49,9 +49,9 @@
#include "util/UriQueryParser.hxx" #include "util/UriQueryParser.hxx"
#endif #endif
#include <cassert>
#include <cinttypes> #include <cinttypes>
#include <assert.h>
#include <string.h> #include <string.h>
#include <curl/curl.h> #include <curl/curl.h>
......
...@@ -21,10 +21,9 @@ ...@@ -21,10 +21,9 @@
#include "lib/crypto/MD5.hxx" #include "lib/crypto/MD5.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
namespace { namespace {
class QueryStringBuilder { class QueryStringBuilder {
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Ref.hxx" #include "Ref.hxx"
#include "Exception.hxx" #include "Exception.hxx"
#include <assert.h> #include <cassert>
namespace Java { namespace Java {
/** /**
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <jni.h> #include <jni.h>
#include <assert.h> #include <cassert>
namespace Java { namespace Java {
/** /**
......
...@@ -34,10 +34,9 @@ ...@@ -34,10 +34,9 @@
#include <jni.h> #include <jni.h>
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
namespace Java { namespace Java {
/** /**
* Hold a local reference on a JNI object. * Hold a local reference on a JNI object.
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <assert.h> #include <cassert>
#if SND_LIB_VERSION >= 0x1001c #if SND_LIB_VERSION >= 0x1001c
/* alsa-lib supports DSD since version 1.0.27.1 */ /* alsa-lib supports DSD since version 1.0.27.1 */
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#include <stdint.h> #include <stdint.h>
namespace Alsa { namespace Alsa {
......
...@@ -30,10 +30,9 @@ ...@@ -30,10 +30,9 @@
#include "Delegate.hxx" #include "Delegate.hxx"
#include "Parser.hxx" #include "Parser.hxx"
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
void void
DelegateCurlResponseHandler::OnHeaders(unsigned status, DelegateCurlResponseHandler::OnHeaders(unsigned status,
std::multimap<std::string, std::string> &&headers) std::multimap<std::string, std::string> &&headers)
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include <assert.h> #include <cassert>
static constexpr Domain curlm_domain("curlm"); static constexpr Domain curlm_domain("curlm");
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "event/Call.hxx" #include "event/Call.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include <assert.h> #include <cassert>
Mutex CurlInit::mutex; Mutex CurlInit::mutex;
unsigned CurlInit::ref; unsigned CurlInit::ref;
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#include <curl/curl.h> #include <curl/curl.h>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#include <string.h> #include <string.h>
CurlRequest::CurlRequest(CurlGlobal &_global, CurlRequest::CurlRequest(CurlGlobal &_global,
......
...@@ -33,10 +33,9 @@ ...@@ -33,10 +33,9 @@
#include "PendingCall.hxx" #include "PendingCall.hxx"
#include "Message.hxx" #include "Message.hxx"
#include <cassert>
#include <functional> #include <functional>
#include <assert.h>
namespace ODBus { namespace ODBus {
/** /**
......
...@@ -28,7 +28,8 @@ extern "C" { ...@@ -28,7 +28,8 @@ extern "C" {
#include <libavutil/mathematics.h> #include <libavutil/mathematics.h>
} }
#include <assert.h> #include <cassert>
#include <stdint.h> #include <stdint.h>
/* suppress the ffmpeg compatibility macro */ /* suppress the ffmpeg compatibility macro */
......
...@@ -40,9 +40,9 @@ ...@@ -40,9 +40,9 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include <cassert>
#include <memory> #include <memory>
#include <assert.h>
#include <string.h> #include <string.h>
AllocatedString<> AllocatedString<>
......
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include <cassert>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
#ifdef HAVE_ICU #ifdef HAVE_ICU
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include <unicode/ustring.h> #include <unicode/ustring.h>
#include <cassert>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
AllocatedArray<UChar> AllocatedArray<UChar>
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
#include "Base.hxx" #include "Base.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static char nfs_base_server[64]; static char nfs_base_server[64];
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
#include <boost/intrusive/list.hpp> #include <boost/intrusive/list.hpp>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
template<typename T> template<typename T>
class CancellablePointer class CancellablePointer
......
...@@ -37,7 +37,8 @@ extern "C" { ...@@ -37,7 +37,8 @@ extern "C" {
#include <nfsc/libnfs.h> #include <nfsc/libnfs.h>
} }
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static StringBuffer<256> static StringBuffer<256>
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include "event/Call.hxx" #include "event/Call.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include <utility> #include <cassert>
#include <stdexcept> #include <stdexcept>
#include <utility>
#include <assert.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "event/Call.hxx" #include "event/Call.hxx"
#include "util/Manual.hxx" #include "util/Manual.hxx"
#include <assert.h> #include <cassert>
static Manual<NfsManager> nfs_glue; static Manual<NfsManager> nfs_glue;
static unsigned in_use; static unsigned in_use;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <sqlite3.h> #include <sqlite3.h>
#include <assert.h> #include <cassert>
namespace Sqlite { namespace Sqlite {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <upnptools.h> #include <upnptools.h>
#include <assert.h> #include <cassert>
static Mutex upnp_client_init_mutex; static Mutex upnp_client_init_mutex;
static unsigned upnp_client_ref; static unsigned upnp_client_ref;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <upnptools.h> #include <upnptools.h>
#include <ixml.h> #include <ixml.h>
#include <assert.h> #include <cassert>
static Mutex upnp_init_mutex; static Mutex upnp_init_mutex;
static unsigned upnp_ref; static unsigned upnp_ref;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "ReplayGainInfo.hxx" #include "ReplayGainInfo.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <assert.h> #include <cassert>
static StringView static StringView
ToStringView(const FLAC__StreamMetadata_VorbisComment_Entry &entry) noexcept ToStringView(const FLAC__StreamMetadata_VorbisComment_Entry &entry) noexcept
......
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
#include <ogg/ogg.h> #include <ogg/ogg.h>
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
......
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
#include <ogg/ogg.h> #include <ogg/ogg.h>
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "client/Response.hxx" #include "client/Response.hxx"
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include <assert.h> #include <cassert>
#include <string> #include <string>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
gcc_pure gcc_pure
static int static int
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "MixerControl.hxx" #include "MixerControl.hxx"
#include "MixerInternal.hxx" #include "MixerInternal.hxx"
#include <assert.h> #include <cassert>
Mixer * Mixer *
mixer_new(EventLoop &event_loop, mixer_new(EventLoop &event_loop,
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include "MixerType.hxx" #include "MixerType.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
MixerType MixerType
......
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
#include "fs/io/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
#define SW_VOLUME_STATE "sw_volume: " #define SW_VOLUME_STATE "sw_volume: "
......
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <fcntl.h> #include <fcntl.h>
......
...@@ -32,10 +32,9 @@ ...@@ -32,10 +32,9 @@
#include <pulse/stream.h> #include <pulse/stream.h>
#include <pulse/subscribe.h> #include <pulse/subscribe.h>
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
class PulseMixer final : public Mixer { class PulseMixer final : public Mixer {
PulseOutput &output; PulseOutput &output;
......
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
#include "filter/plugins/VolumeFilterPlugin.hxx" #include "filter/plugins/VolumeFilterPlugin.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include <assert.h> #include <cassert>
#include <math.h> #include <math.h>
class SoftwareMixer final : public Mixer { class SoftwareMixer final : public Mixer {
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include <mmsystem.h> #include <mmsystem.h>
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <math.h> #include <math.h>
#include <windows.h> #include <windows.h>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "AddressInfo.hxx" #include "AddressInfo.hxx"
#include "Features.hxx" #include "Features.hxx"
#include <assert.h> #include <cassert>
static constexpr int address_family_ranking[] = { static constexpr int address_family_ranking[] = {
#ifdef HAVE_UN #ifdef HAVE_UN
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "IPv4Address.hxx" #include "IPv4Address.hxx"
#include <assert.h> #include <cassert>
static const struct sockaddr_in * static const struct sockaddr_in *
CastToIPv4(const struct sockaddr *p) noexcept CastToIPv4(const struct sockaddr *p) noexcept
......
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
#include "IPv6Address.hxx" #include "IPv6Address.hxx"
#include "IPv4Address.hxx" #include "IPv4Address.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static const struct sockaddr_in6 * static const struct sockaddr_in6 *
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
#include "IPv6Address.hxx" #include "IPv6Address.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#ifdef HAVE_UN #ifdef HAVE_UN
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "Features.hxx" #include "Features.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
/** /**
* An OO wrapper for struct sockaddr_storage. * An OO wrapper for struct sockaddr_storage.
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "IPv4Address.hxx" #include "IPv4Address.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#ifdef _WIN32 #ifdef _WIN32
#include <ws2tcpip.h> #include <ws2tcpip.h>
...@@ -48,7 +49,6 @@ ...@@ -48,7 +49,6 @@
#include <sys/un.h> #include <sys/un.h>
#endif #endif
#include <assert.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UN #ifdef HAVE_UN
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "config/Block.hxx" #include "config/Block.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
/** after a failure, wait this duration before /** after a failure, wait this duration before
automatically reopening the device */ automatically reopening the device */
......
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
#include "util/StringFormat.hxx" #include "util/StringFormat.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
#define AUDIO_OUTPUT_TYPE "type" #define AUDIO_OUTPUT_TYPE "type"
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/StringAPI.hxx" #include "util/StringAPI.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
MultipleOutputs::MultipleOutputs(AudioOutputClient &_client, MultipleOutputs::MultipleOutputs(AudioOutputClient &_client,
......
...@@ -28,11 +28,10 @@ ...@@ -28,11 +28,10 @@
#include "Chrono.hxx" #include "Chrono.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <cassert>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <assert.h>
class MusicPipe; class MusicPipe;
class EventLoop; class EventLoop;
class MixerListener; class MixerListener;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "OutputPlugin.hxx" #include "OutputPlugin.hxx"
#include <assert.h> #include <cassert>
AudioOutput * AudioOutput *
ao_plugin_init(EventLoop &event_loop, ao_plugin_init(EventLoop &event_loop,
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
struct MusicChunk; struct MusicChunk;
class MusicPipe; class MusicPipe;
......
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <utility> #include <cassert>
#include <memory> #include <memory>
#include <utility>
#include <assert.h>
#include <stdint.h> #include <stdint.h>
struct MusicChunk; struct MusicChunk;
......
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
void void
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "Timer.hxx" #include "Timer.hxx"
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include <assert.h> #include <cassert>
Timer::Timer(const AudioFormat af) Timer::Timer(const AudioFormat af)
:rate(af.sample_rate * af.GetFrameSize()) :rate(af.sample_rate * af.GetFrameSize())
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
#include "Log.hxx" #include "Log.hxx"
#include <atomic> #include <atomic>
#include <cassert>
#include <assert.h>
#include <jack/jack.h> #include <jack/jack.h>
#include <jack/types.h> #include <jack/types.h>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <iterator> #include <iterator>
#include <stdexcept> #include <stdexcept>
...@@ -36,7 +37,6 @@ ...@@ -36,7 +37,6 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h>
#if defined(__OpenBSD__) || defined(__NetBSD__) #if defined(__OpenBSD__) || defined(__NetBSD__)
# include <soundcard.h> # include <soundcard.h>
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
#include <pulse/subscribe.h> #include <pulse/subscribe.h>
#include <pulse/version.h> #include <pulse/version.h>
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include <stdexcept> #include <cassert>
#include <memory> #include <memory>
#include <stdexcept>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
static constexpr Domain recorder_domain("recorder"); static constexpr Domain recorder_domain("recorder");
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
#include <shout/shout.h> #include <shout/shout.h>
#include <stdexcept> #include <cassert>
#include <memory> #include <memory>
#include <stdexcept>
#include <assert.h>
#include <stdio.h> #include <stdio.h>
static constexpr unsigned DEFAULT_CONN_TIMEOUT = 2; static constexpr unsigned DEFAULT_CONN_TIMEOUT = 2;
......
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
#include "net/UniqueSocketDescriptor.hxx" #include "net/UniqueSocketDescriptor.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "util/DeleteDisposer.hxx" #include "util/DeleteDisposer.hxx"
#include "config/Net.hxx" #include "config/Net.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include <assert.h> #include <cassert>
#include <stdio.h> #include <stdio.h>
void void
......
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <assert.h> #include <cassert>
void void
PcmChannelsConverter::Open(SampleFormat _format, PcmChannelsConverter::Open(SampleFormat _format,
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "Buffer.hxx" #include "Buffer.hxx"
#ifndef NDEBUG #ifndef NDEBUG
#include <assert.h> #include <cassert>
#endif #endif
template<typename T> struct ConstBuffer; template<typename T> struct ConstBuffer;
......
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
#include "SoxrResampler.hxx" #include "SoxrResampler.hxx"
#endif #endif
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
enum class SelectedResampler { enum class SelectedResampler {
......
...@@ -21,10 +21,9 @@ ...@@ -21,10 +21,9 @@
#include "ConfiguredResampler.hxx" #include "ConfiguredResampler.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
void void
pcm_convert_global_init(const ConfigData &config) pcm_convert_global_init(const ConfigData &config)
{ {
......
...@@ -21,10 +21,9 @@ ...@@ -21,10 +21,9 @@
#include "ChannelDefs.hxx" #include "ChannelDefs.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <cassert>
#include <functional> #include <functional>
#include <assert.h>
static constexpr uint32_t static constexpr uint32_t
pcm_two_dsd_to_dop_marker1(uint8_t a, uint8_t b) noexcept pcm_two_dsd_to_dop_marker1(uint8_t a, uint8_t b) noexcept
{ {
......
...@@ -35,7 +35,8 @@ or implied, of Sebastian Gesemann. ...@@ -35,7 +35,8 @@ or implied, of Sebastian Gesemann.
#include "util/BitReverse.hxx" #include "util/BitReverse.hxx"
#include "util/GenerateArray.hxx" #include "util/GenerateArray.hxx"
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/WritableBuffer.hxx" #include "util/WritableBuffer.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
void void
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "FallbackResampler.hxx" #include "FallbackResampler.hxx"
#include <assert.h> #include <cassert>
AudioFormat AudioFormat
FallbackPcmResampler::Open(AudioFormat &af, unsigned new_sample_rate) FallbackPcmResampler::Open(AudioFormat &af, unsigned new_sample_rate)
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <assert.h> #include <cassert>
void void
PcmFormatConverter::Open(SampleFormat _src_format, SampleFormat _dest_format) PcmFormatConverter::Open(SampleFormat _src_format, SampleFormat _dest_format)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "Dither.hxx" #include "Dither.hxx"
#ifndef NDEBUG #ifndef NDEBUG
#include <assert.h> #include <cassert>
#endif #endif
template<typename T> struct ConstBuffer; template<typename T> struct ConstBuffer;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "Resampler.hxx" #include "Resampler.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include <assert.h> #include <cassert>
GluePcmResampler::GluePcmResampler() GluePcmResampler::GluePcmResampler()
:resampler(pcm_resampler_create()) {} :resampler(pcm_resampler_create()) {}
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
......
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include "Dither.cxx" // including the .cxx file to get inlined templates #include "Dither.cxx" // including the .cxx file to get inlined templates
#include <cassert>
#include <cmath> #include <cmath>
#include <assert.h>
template<SampleFormat F, class Traits=SampleTraits<F>> template<SampleFormat F, class Traits=SampleTraits<F>>
static typename Traits::value_type static typename Traits::value_type
PcmAddVolume(PcmDither &dither, PcmAddVolume(PcmDither &dither,
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include <array> #include <array>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
template<typename D, typename S> template<typename D, typename S>
static void static void
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "Dsd2Pcm.hxx" #include "Dsd2Pcm.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <assert.h> #include <cassert>
ConstBuffer<float> ConstBuffer<float>
PcmDsd::ToFloat(unsigned channels, ConstBuffer<uint8_t> src) noexcept PcmDsd::ToFloat(unsigned channels, ConstBuffer<uint8_t> src) noexcept
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include "ChannelDefs.hxx" #include "ChannelDefs.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#include <stddef.h> #include <stddef.h>
template<typename T> struct ConstBuffer; template<typename T> struct ConstBuffer;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "SampleFormat.hxx" #include "SampleFormat.hxx"
#include <assert.h> #include <cassert>
const char * const char *
sample_format_to_string(SampleFormat format) noexcept sample_format_to_string(SampleFormat format) noexcept
......
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
#include <soxr.h> #include <soxr.h>
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static constexpr Domain soxr_domain("soxr"); static constexpr Domain soxr_domain("soxr");
......
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
#include "Dither.cxx" // including the .cxx file to get inlined templates #include "Dither.cxx" // including the .cxx file to get inlined templates
#include <assert.h> #include <cassert>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "Dither.hxx" #include "Dither.hxx"
#ifndef NDEBUG #ifndef NDEBUG
#include <assert.h> #include <cassert>
#endif #endif
template<typename T> struct ConstBuffer; template<typename T> struct ConstBuffer;
......
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
#include "song/DetachedSong.hxx" #include "song/DetachedSong.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
PlayerControl::PlayerControl(PlayerListener &_listener, PlayerControl::PlayerControl(PlayerListener &_listener,
PlayerOutputs &_outputs, PlayerOutputs &_outputs,
......
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <cmath> #include <cmath>
#include <assert.h>
static constexpr Domain cross_fade_domain("cross_fade"); static constexpr Domain cross_fade_domain("cross_fade");
gcc_pure gcc_pure
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "storage/StorageInterface.hxx" #include "storage/StorageInterface.hxx"
#include "util/UriUtil.hxx" #include "util/UriUtil.hxx"
#include <assert.h> #include <cassert>
/** /**
* Load a playlist from the configured playlist directory. * Load a playlist from the configured playlist directory.
......
...@@ -38,10 +38,9 @@ ...@@ -38,10 +38,9 @@
#include "config/Data.hxx" #include "config/Data.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include <cassert>
#include <iterator> #include <iterator>
#include <assert.h>
const PlaylistPlugin *const playlist_plugins[] = { const PlaylistPlugin *const playlist_plugins[] = {
&extm3u_playlist_plugin, &extm3u_playlist_plugin,
&m3u_playlist_plugin, &m3u_playlist_plugin,
......
...@@ -26,10 +26,9 @@ ...@@ -26,10 +26,9 @@
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
static std::unique_ptr<SongEnumerator> static std::unique_ptr<SongEnumerator>
playlist_open_path_suffix(Path path, Mutex &mutex) playlist_open_path_suffix(Path path, Mutex &mutex)
try { try {
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include "util/StringStrip.hxx" #include "util/StringStrip.hxx"
#include "util/CharUtil.hxx" #include "util/CharUtil.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
#include "util/Compiler.h" #include "util/Compiler.h"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
/** /**
* A table that maps id numbers to position numbers. * A table that maps id numbers to position numbers.
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "SingleMode.hxx" #include "SingleMode.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
void void
playlist::TagModified(DetachedSong &&song) noexcept playlist::TagModified(DetachedSong &&song) noexcept
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include "SingleMode.hxx" #include "SingleMode.hxx"
#include "util/LazyRandomEngine.hxx" #include "util/LazyRandomEngine.hxx"
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
#include <stdint.h> #include <stdint.h>
class DetachedSong; class DetachedSong;
......
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/UriUtil.hxx" #include "util/UriUtil.hxx"
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
#define LOCATE_TAG_FILE_KEY "file" #define LOCATE_TAG_FILE_KEY "file"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "StringFilter.hxx" #include "StringFilter.hxx"
#include "util/StringAPI.hxx" #include "util/StringAPI.hxx"
#include <assert.h> #include <cassert>
bool bool
StringFilter::MatchWithoutNegation(const char *s) const noexcept StringFilter::MatchWithoutNegation(const char *s) const noexcept
......
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include <cassert>
#include <iterator> #include <iterator>
#include <assert.h>
using namespace Sqlite; using namespace Sqlite;
enum sticker_sql { enum sticker_sql {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "MemoryDirectoryReader.hxx" #include "MemoryDirectoryReader.hxx"
#include <assert.h> #include <cassert>
const char * const char *
MemoryStorageDirectoryReader::Read() noexcept MemoryStorageDirectoryReader::Read() noexcept
......
...@@ -41,12 +41,11 @@ ...@@ -41,12 +41,11 @@
#include "util/StringFormat.hxx" #include "util/StringFormat.hxx"
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include <cassert>
#include <memory> #include <memory>
#include <string> #include <string>
#include <utility> #include <utility>
#include <assert.h>
class CurlStorage final : public Storage { class CurlStorage final : public Storage {
const std::string base; const std::string base;
......
...@@ -42,9 +42,9 @@ extern "C" { ...@@ -42,9 +42,9 @@ extern "C" {
#include <nfsc/libnfs-raw-nfs.h> #include <nfsc/libnfs-raw-nfs.h>
} }
#include <cassert>
#include <string> #include <string>
#include <assert.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
......
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
#include "system/Error.hxx" #include "system/Error.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
#include <sys/eventfd.h> #include <sys/eventfd.h>
EventFD::EventFD() EventFD::EventFD()
......
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
#include "system/Error.hxx" #include "system/Error.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
#include <unistd.h> #include <unistd.h>
#ifdef _WIN32 #ifdef _WIN32
......
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
#include "FileDescriptor.hxx" #include "FileDescriptor.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include <assert.h> #include <cassert>
#include <stdint.h> #include <stdint.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
......
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
#include "SignalFD.hxx" #include "SignalFD.hxx"
#include "Error.hxx" #include "Error.hxx"
#include <assert.h> #include <cassert>
#include <sys/signalfd.h> #include <sys/signalfd.h>
void void
......
...@@ -32,10 +32,9 @@ ...@@ -32,10 +32,9 @@
#include "FileDescriptor.hxx" #include "FileDescriptor.hxx"
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
/** /**
* An OO wrapper for a UNIX file descriptor. * An OO wrapper for a UNIX file descriptor.
*/ */
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <cassert>
#include <memory> #include <memory>
#include <stdint.h> #include <stdint.h>
#include <assert.h>
#include <string.h> #include <string.h>
struct ApeFooter { struct ApeFooter {
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cassert>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
TagBuilder::TagBuilder(const Tag &other) noexcept TagBuilder::TagBuilder(const Tag &other) noexcept
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include "util/UTF8.hxx" #include "util/UTF8.hxx"
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
gcc_pure gcc_pure
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <assert.h> #include <cassert>
template<typename T> template<typename T>
static bool static bool
......
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
TagType TagType
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "util/VarSize.hxx" #include "util/VarSize.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <cassert>
#include <limits> #include <limits>
#include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"
#include <assert.h> #include <cassert>
template<typename T> template<typename T>
static bool static bool
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "Pool.hxx" #include "Pool.hxx"
#include "Builder.hxx" #include "Builder.hxx"
#include <assert.h> #include <cassert>
void void
Tag::Clear() noexcept Tag::Clear() noexcept
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "VorbisComment.hxx" #include "VorbisComment.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <assert.h> #include <cassert>
StringView StringView
GetVorbisCommentValue(StringView entry, StringView name) noexcept GetVorbisCommentValue(StringView entry, StringView name) noexcept
......
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
#include "util/BindMethod.hxx" #include "util/BindMethod.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <cassert>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#include <pthread.h> #include <pthread.h>
#endif #endif
#include <assert.h>
class Thread { class Thread {
typedef BoundMethod<void() noexcept> Function; typedef BoundMethod<void() noexcept> Function;
const Function f; const Function f;
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
#include "Convert.hxx" #include "Convert.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
StringBuffer<64> StringBuffer<64>
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#include "Parser.hxx" #include "Parser.hxx"
#include "Convert.hxx" #include "Convert.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <time.h> #include <time.h>
std::chrono::system_clock::time_point std::chrono::system_clock::time_point
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
#include "StringView.hxx" #include "StringView.hxx"
#include "Compiler.h" #include "Compiler.h"
#include <assert.h> #include <cassert>
#include <strings.h> #include <strings.h>
/** /**
......
...@@ -35,8 +35,7 @@ ...@@ -35,8 +35,7 @@
#include "Compiler.h" #include "Compiler.h"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
/** /**
* An array allocated on the heap with a length determined at runtime. * An array allocated on the heap with a length determined at runtime.
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "Compiler.h" #include "Compiler.h"
#include <assert.h> #include <cassert>
void void
reverse_bytes_16(uint16_t *gcc_restrict dest, reverse_bytes_16(uint16_t *gcc_restrict dest,
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
#include "WritableBuffer.hxx" #include "WritableBuffer.hxx"
#include <assert.h> #include <cassert>
#include <stddef.h> #include <stddef.h>
/** /**
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <cstddef> #include <cstddef>
#ifndef NDEBUG #ifndef NDEBUG
#include <assert.h> #include <cassert>
#endif #endif
template<typename T> template<typename T>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef MPD_DIVIDE_STRING_HXX #ifndef MPD_DIVIDE_STRING_HXX
#define MPD_DIVIDE_STRING_HXX #define MPD_DIVIDE_STRING_HXX
#include <assert.h> #include <cassert>
/** /**
* Split a given constant string at a separator character. Duplicates * Split a given constant string at a separator character. Duplicates
......
...@@ -32,12 +32,10 @@ ...@@ -32,12 +32,10 @@
#include "WritableBuffer.hxx" #include "WritableBuffer.hxx"
#include <utility>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <cstddef> #include <cstddef>
#include <utility>
#include <assert.h>
/** /**
* A first-in-first-out buffer: you can append data at the end, and * A first-in-first-out buffer: you can append data at the end, and
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#ifndef MPD_LAZY_RANDOM_ENGINE_HXX #ifndef MPD_LAZY_RANDOM_ENGINE_HXX
#define MPD_LAZY_RANDOM_ENGINE_HXX #define MPD_LAZY_RANDOM_ENGINE_HXX
#include <cassert>
#include <random> #include <random>
#include <assert.h>
/** /**
* A random engine that will be created and seeded on demand. * A random engine that will be created and seeded on demand.
*/ */
......
...@@ -30,11 +30,10 @@ ...@@ -30,11 +30,10 @@
#ifndef MANUAL_HXX #ifndef MANUAL_HXX
#define MANUAL_HXX #define MANUAL_HXX
#include <cassert>
#include <new> #include <new>
#include <utility> #include <utility>
#include <assert.h>
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstrict-aliasing" #pragma GCC diagnostic ignored "-Wstrict-aliasing"
......
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
#ifndef NUMBER_PARSER_HXX #ifndef NUMBER_PARSER_HXX
#define NUMBER_PARSER_HXX #define NUMBER_PARSER_HXX
#include <assert.h> #include <cassert>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef MPD_UTIL_OPTIONDEF_HXX #ifndef MPD_UTIL_OPTIONDEF_HXX
#define MPD_UTIL_OPTIONDEF_HXX #define MPD_UTIL_OPTIONDEF_HXX
#include <assert.h> #include <cassert>
/** /**
* Command line option definition. * Command line option definition.
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#include "DynamicFifoBuffer.hxx" #include "DynamicFifoBuffer.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#include <string.h> #include <string.h>
PeakBuffer::~PeakBuffer() PeakBuffer::~PeakBuffer()
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#include "HugeAllocator.hxx" #include "HugeAllocator.hxx"
#include "Compiler.h" #include "Compiler.h"
#include <utility> #include <cassert>
#include <new> #include <new>
#include <utility>
#include <assert.h>
#include <stddef.h> #include <stddef.h>
/** /**
......
...@@ -34,10 +34,9 @@ ...@@ -34,10 +34,9 @@
#include "ConstBuffer.hxx" #include "ConstBuffer.hxx"
#include "WritableBuffer.hxx" #include "WritableBuffer.hxx"
#include <cassert>
#include <map> #include <map>
#include <assert.h>
/** /**
* Helper class for #SparseBuffer which describes which portions of * Helper class for #SparseBuffer which describes which portions of
* the buffer have "known" data. * the buffer have "known" data.
......
...@@ -32,11 +32,10 @@ ...@@ -32,11 +32,10 @@
#include "WritableBuffer.hxx" #include "WritableBuffer.hxx"
#include <utility>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <cstddef> #include <cstddef>
#include <utility>
#include <assert.h>
/** /**
* A first-in-first-out buffer: you can append data at the end, and * A first-in-first-out buffer: you can append data at the end, and
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "CharUtil.hxx" #include "CharUtil.hxx"
#include "ASCII.hxx" #include "ASCII.hxx"
#include <assert.h> #include <cassert>
bool bool
StringArrayContainsCase(const char *const*haystack, StringArrayContainsCase(const char *const*haystack,
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
#include "StringAPI.hxx" #include "StringAPI.hxx"
#include "StringCompare.hxx" #include "StringCompare.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
bool bool
......
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
#include "UriUtil.hxx" #include "UriUtil.hxx"
#include "ASCII.hxx" #include "ASCII.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static const char * static const char *
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <cstddef> #include <cstddef>
#ifndef NDEBUG #ifndef NDEBUG
#include <assert.h> #include <cassert>
#endif #endif
template<typename T> template<typename T>
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
#include "Log.hxx" #include "Log.hxx"
#include "LogBackend.hxx" #include "LogBackend.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
#include "config/Block.hxx" #include "config/Block.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
const FilterPlugin * const FilterPlugin *
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
#include "Log.hxx" #include "Log.hxx"
#include "LogBackend.hxx" #include "LogBackend.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
#include "Log.hxx" #include "Log.hxx"
#include "LogBackend.hxx" #include "LogBackend.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
#include <cassert>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
#include <cassert>
#include <memory> #include <memory>
#include <assert.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#include "tag/Builder.hxx" #include "tag/Builder.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
#include <cassert>
#include <memory> #include <memory>
#include <assert.h>
#include <stddef.h> #include <stddef.h>
static uint8_t zero[256]; static uint8_t zero[256];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment