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/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;
 	});
-}
+}
--- 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
@@ -21,7 +21,8 @@
 #include "CondHandler.hxx"
 #include "thread/Name.hxx"

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

 ThreadInputStream::ThreadInputStream(const char *_plugin,
--- a/src/input/ThreadInputStream.hxx
+++ b/src/input/ThreadInputStream.hxx
@@ -26,9 +26,9 @@
 #include "util/HugeAllocator.hxx"
 #include "util/CircularBuffer.hxx"

+#include <cassert>
 #include <exception>

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

 /**
--- a/src/input/cache/Item.cxx
+++ b/src/input/cache/Item.cxx
@@ -21,7 +21,7 @@
 #include "Lease.hxx"
 #include "input/InputStream.hxx"

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

 InputCacheItem::InputCacheItem(InputStreamPtr _input) noexcept
 	:BufferingInputStream(std::move(_input)),
--- a/src/input/plugins/AlsaInputPlugin.cxx
+++ b/src/input/plugins/AlsaInputPlugin.cxx
@@ -43,7 +43,8 @@

 #include <alsa/asoundlib.h>

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

 static constexpr Domain alsa_input_domain("alsa");
--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
@@ -34,11 +34,12 @@
 #include "Log.hxx"
 #include "config/Block.hxx"

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

 #include <cdio/cd_types.h>

--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -49,9 +49,9 @@
 #include "util/UriQueryParser.hxx"
 #endif

+#include <cassert>
 #include <cinttypes>

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

 #include <curl/curl.h>
--- a/src/input/plugins/QobuzClient.cxx
+++ b/src/input/plugins/QobuzClient.cxx
@@ -21,10 +21,9 @@
 #include "lib/crypto/MD5.hxx"
 #include "util/ConstBuffer.hxx"

+#include <cassert>
 #include <stdexcept>

-#include <assert.h>
-
 namespace {

 class QueryStringBuilder {