From ab9f5d2067e1f8f22cb5009015ec059f4a1a7431 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 12 Mar 2020 15:20:59 -0700
Subject: 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>
---
 src/lib/alsa/Format.hxx             | 2 +-
 src/lib/alsa/PeriodBuffer.hxx       | 2 +-
 src/lib/curl/Delegate.cxx           | 3 +--
 src/lib/curl/Global.cxx             | 2 +-
 src/lib/curl/Init.cxx               | 2 +-
 src/lib/curl/Request.cxx            | 2 +-
 src/lib/dbus/AsyncRequest.hxx       | 3 +--
 src/lib/ffmpeg/Time.hxx             | 3 ++-
 src/lib/icu/CaseFold.cxx            | 2 +-
 src/lib/icu/Collate.cxx             | 2 +-
 src/lib/icu/Util.cxx                | 2 +-
 src/lib/nfs/Base.cxx                | 3 ++-
 src/lib/nfs/Cancellable.hxx         | 3 +--
 src/lib/nfs/Error.cxx               | 3 ++-
 src/lib/nfs/FileReader.cxx          | 4 ++--
 src/lib/nfs/Glue.cxx                | 2 +-
 src/lib/sqlite/Util.hxx             | 2 +-
 src/lib/upnp/ClientInit.cxx         | 2 +-
 src/lib/upnp/Init.cxx               | 2 +-
 src/lib/xiph/FlacStreamMetadata.cxx | 2 +-
 src/lib/xiph/OggPage.hxx            | 3 ++-
 src/lib/xiph/OggStreamState.hxx     | 3 ++-
 22 files changed, 28 insertions(+), 26 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/alsa/Format.hxx b/src/lib/alsa/Format.hxx
index f7fb8ca2e..1060ff194 100644
--- a/src/lib/alsa/Format.hxx
+++ b/src/lib/alsa/Format.hxx
@@ -26,7 +26,7 @@
 
 #include <alsa/asoundlib.h>
 
-#include <assert.h>
+#include <cassert>
 
 #if SND_LIB_VERSION >= 0x1001c
 /* alsa-lib supports DSD since version 1.0.27.1 */
diff --git a/src/lib/alsa/PeriodBuffer.hxx b/src/lib/alsa/PeriodBuffer.hxx
index 6c634e21d..816af621f 100644
--- a/src/lib/alsa/PeriodBuffer.hxx
+++ b/src/lib/alsa/PeriodBuffer.hxx
@@ -23,8 +23,8 @@
 #include <alsa/asoundlib.h>
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
 #include <stdint.h>
 
 namespace Alsa {
diff --git a/src/lib/curl/Delegate.cxx b/src/lib/curl/Delegate.cxx
index 2ebb9cd7a..a16793ed2 100644
--- a/src/lib/curl/Delegate.cxx
+++ b/src/lib/curl/Delegate.cxx
@@ -30,10 +30,9 @@
 #include "Delegate.hxx"
 #include "Parser.hxx"
 
+#include <cassert>
 #include <utility>
 
-#include <assert.h>
-
 void
 DelegateCurlResponseHandler::OnHeaders(unsigned status,
 				       std::multimap<std::string, std::string> &&headers)
diff --git a/src/lib/curl/Global.cxx b/src/lib/curl/Global.cxx
index c83df1ad4..24c17798e 100644
--- a/src/lib/curl/Global.cxx
+++ b/src/lib/curl/Global.cxx
@@ -35,7 +35,7 @@
 #include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr Domain curlm_domain("curlm");
 
diff --git a/src/lib/curl/Init.cxx b/src/lib/curl/Init.cxx
index 9b38c746f..4fa067bc3 100644
--- a/src/lib/curl/Init.cxx
+++ b/src/lib/curl/Init.cxx
@@ -32,7 +32,7 @@
 #include "event/Call.hxx"
 #include "thread/Mutex.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 Mutex CurlInit::mutex;
 unsigned CurlInit::ref;
diff --git a/src/lib/curl/Request.cxx b/src/lib/curl/Request.cxx
index 864a92d3f..eb3afbff1 100644
--- a/src/lib/curl/Request.cxx
+++ b/src/lib/curl/Request.cxx
@@ -40,8 +40,8 @@
 #include <curl/curl.h>
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
 #include <string.h>
 
 CurlRequest::CurlRequest(CurlGlobal &_global,
diff --git a/src/lib/dbus/AsyncRequest.hxx b/src/lib/dbus/AsyncRequest.hxx
index 9450a3e7a..1c3cf0ff7 100644
--- a/src/lib/dbus/AsyncRequest.hxx
+++ b/src/lib/dbus/AsyncRequest.hxx
@@ -33,10 +33,9 @@
 #include "PendingCall.hxx"
 #include "Message.hxx"
 
+#include <cassert>
 #include <functional>
 
-#include <assert.h>
-
 namespace ODBus {
 
 /**
diff --git a/src/lib/ffmpeg/Time.hxx b/src/lib/ffmpeg/Time.hxx
index f2d589d15..bd189e255 100644
--- a/src/lib/ffmpeg/Time.hxx
+++ b/src/lib/ffmpeg/Time.hxx
@@ -28,7 +28,8 @@ extern "C" {
 #include <libavutil/mathematics.h>
 }
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdint.h>
 
 /* suppress the ffmpeg compatibility macro */
diff --git a/src/lib/icu/CaseFold.cxx b/src/lib/icu/CaseFold.cxx
index 74e378e92..26ae6cba5 100644
--- a/src/lib/icu/CaseFold.cxx
+++ b/src/lib/icu/CaseFold.cxx
@@ -40,9 +40,9 @@
 #include <windows.h>
 #endif
 
+#include <cassert>
 #include <memory>
 
-#include <assert.h>
 #include <string.h>
 
 AllocatedString<>
diff --git a/src/lib/icu/Collate.cxx b/src/lib/icu/Collate.cxx
index d84881017..d3cf68cb1 100644
--- a/src/lib/icu/Collate.cxx
+++ b/src/lib/icu/Collate.cxx
@@ -38,10 +38,10 @@
 #include <windows.h>
 #endif
 
+#include <cassert>
 #include <memory>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 #ifdef HAVE_ICU
diff --git a/src/lib/icu/Util.cxx b/src/lib/icu/Util.cxx
index 461043fea..74904dd09 100644
--- a/src/lib/icu/Util.cxx
+++ b/src/lib/icu/Util.cxx
@@ -24,10 +24,10 @@
 
 #include <unicode/ustring.h>
 
+#include <cassert>
 #include <memory>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 AllocatedArray<UChar>
diff --git a/src/lib/nfs/Base.cxx b/src/lib/nfs/Base.cxx
index a3d33cc63..92020b861 100644
--- a/src/lib/nfs/Base.cxx
+++ b/src/lib/nfs/Base.cxx
@@ -19,7 +19,8 @@
 
 #include "Base.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static char nfs_base_server[64];
diff --git a/src/lib/nfs/Cancellable.hxx b/src/lib/nfs/Cancellable.hxx
index e859688df..a571ac315 100644
--- a/src/lib/nfs/Cancellable.hxx
+++ b/src/lib/nfs/Cancellable.hxx
@@ -25,8 +25,7 @@
 #include <boost/intrusive/list.hpp>
 
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 template<typename T>
 class CancellablePointer
diff --git a/src/lib/nfs/Error.cxx b/src/lib/nfs/Error.cxx
index 942e6cabf..3214b7c76 100644
--- a/src/lib/nfs/Error.cxx
+++ b/src/lib/nfs/Error.cxx
@@ -37,7 +37,8 @@ extern "C" {
 #include <nfsc/libnfs.h>
 }
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static StringBuffer<256>
diff --git a/src/lib/nfs/FileReader.cxx b/src/lib/nfs/FileReader.cxx
index af904f5c1..6e66bfa71 100644
--- a/src/lib/nfs/FileReader.cxx
+++ b/src/lib/nfs/FileReader.cxx
@@ -24,10 +24,10 @@
 #include "event/Call.hxx"
 #include "util/ASCII.hxx"
 
-#include <utility>
+#include <cassert>
 #include <stdexcept>
+#include <utility>
 
-#include <assert.h>
 #include <string.h>
 #include <fcntl.h>
 
diff --git a/src/lib/nfs/Glue.cxx b/src/lib/nfs/Glue.cxx
index 9101ad78c..329e39134 100644
--- a/src/lib/nfs/Glue.cxx
+++ b/src/lib/nfs/Glue.cxx
@@ -22,7 +22,7 @@
 #include "event/Call.hxx"
 #include "util/Manual.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static Manual<NfsManager> nfs_glue;
 static unsigned in_use;
diff --git a/src/lib/sqlite/Util.hxx b/src/lib/sqlite/Util.hxx
index 664d03cc3..ba142f55a 100644
--- a/src/lib/sqlite/Util.hxx
+++ b/src/lib/sqlite/Util.hxx
@@ -25,7 +25,7 @@
 
 #include <sqlite3.h>
 
-#include <assert.h>
+#include <cassert>
 
 namespace Sqlite {
 
diff --git a/src/lib/upnp/ClientInit.cxx b/src/lib/upnp/ClientInit.cxx
index f40e53377..ae001e6e8 100644
--- a/src/lib/upnp/ClientInit.cxx
+++ b/src/lib/upnp/ClientInit.cxx
@@ -25,7 +25,7 @@
 
 #include <upnptools.h>
 
-#include <assert.h>
+#include <cassert>
 
 static Mutex upnp_client_init_mutex;
 static unsigned upnp_client_ref;
diff --git a/src/lib/upnp/Init.cxx b/src/lib/upnp/Init.cxx
index c47fc6ee8..4e3176db3 100644
--- a/src/lib/upnp/Init.cxx
+++ b/src/lib/upnp/Init.cxx
@@ -25,7 +25,7 @@
 #include <upnptools.h>
 #include <ixml.h>
 
-#include <assert.h>
+#include <cassert>
 
 static Mutex upnp_init_mutex;
 static unsigned upnp_ref;
diff --git a/src/lib/xiph/FlacStreamMetadata.cxx b/src/lib/xiph/FlacStreamMetadata.cxx
index 9c6e1af90..794f8aafa 100644
--- a/src/lib/xiph/FlacStreamMetadata.cxx
+++ b/src/lib/xiph/FlacStreamMetadata.cxx
@@ -30,7 +30,7 @@
 #include "ReplayGainInfo.hxx"
 #include "util/StringView.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static StringView
 ToStringView(const FLAC__StreamMetadata_VorbisComment_Entry &entry) noexcept
diff --git a/src/lib/xiph/OggPage.hxx b/src/lib/xiph/OggPage.hxx
index 1584ef276..8a63cad61 100644
--- a/src/lib/xiph/OggPage.hxx
+++ b/src/lib/xiph/OggPage.hxx
@@ -22,7 +22,8 @@
 
 #include <ogg/ogg.h>
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <stdint.h>
 
diff --git a/src/lib/xiph/OggStreamState.hxx b/src/lib/xiph/OggStreamState.hxx
index a87e8cb6d..8e8934915 100644
--- a/src/lib/xiph/OggStreamState.hxx
+++ b/src/lib/xiph/OggStreamState.hxx
@@ -22,7 +22,8 @@
 
 #include <ogg/ogg.h>
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <stdint.h>
 
-- 
cgit v1.2.3