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>
2020-03-12 15:20:59 -07:00
parent a718086ffb
commit ab9f5d2067
246 changed files with 320 additions and 317 deletions
--- 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