summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util
diff options
context:
space:
mode:
author firewave <firewave@users.noreply.github.com>2020-01-22 13:31:52 +0100
committer firewave <firewave@users.noreply.github.com>2020-01-22 13:31:52 +0100
commit399515c7a783f84b5c40c5e1733500b3d62bf634 (patch)
tree8f2329af45b7ab0e44ba32c0a1522f3e4184a130 /src/lib/util
parentddf571d8d4488fe9f1003f1cf219cc31d8868283 (diff)
use C++ library includes (nw)
Diffstat (limited to 'src/lib/util')
-rw-r--r--src/lib/util/avhuff.cpp6
-rw-r--r--src/lib/util/bitmap.cpp2
-rw-r--r--src/lib/util/cdrom.cpp4
-rw-r--r--src/lib/util/chd.cpp8
-rw-r--r--src/lib/util/chdcd.cpp6
-rw-r--r--src/lib/util/chdcodec.cpp2
-rw-r--r--src/lib/util/corealloc.h2
-rw-r--r--src/lib/util/corefile.cpp2
-rw-r--r--src/lib/util/corestr.cpp4
-rw-r--r--src/lib/util/corestr.h2
-rw-r--r--src/lib/util/coreutil.cpp2
-rw-r--r--src/lib/util/delegate.cpp4
-rw-r--r--src/lib/util/flac.cpp2
-rw-r--r--src/lib/util/harddisk.cpp4
-rw-r--r--src/lib/util/hash.cpp2
-rw-r--r--src/lib/util/huffman.cpp4
-rw-r--r--src/lib/util/jedparse.cpp8
-rw-r--r--src/lib/util/md5.cpp2
-rw-r--r--src/lib/util/opresolv.cpp8
-rw-r--r--src/lib/util/opresolv.h2
-rw-r--r--src/lib/util/options.cpp8
-rw-r--r--src/lib/util/palette.cpp6
-rw-r--r--src/lib/util/plaparse.cpp8
-rw-r--r--src/lib/util/png.cpp4
-rw-r--r--src/lib/util/pool.cpp6
-rw-r--r--src/lib/util/sha1.cpp6
-rw-r--r--src/lib/util/unicode.h2
-rw-r--r--src/lib/util/vbiparse.cpp2
-rw-r--r--src/lib/util/xmlfile.cpp2
-rw-r--r--src/lib/util/zippath.cpp2
30 files changed, 61 insertions, 61 deletions
diff --git a/src/lib/util/avhuff.cpp b/src/lib/util/avhuff.cpp
index 9975287f4c1..50eea9f24dc 100644
--- a/src/lib/util/avhuff.cpp
+++ b/src/lib/util/avhuff.cpp
@@ -58,14 +58,14 @@
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "avhuff.h"
#include "huffman.h"
#include "chd.h"
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
#include <new>
diff --git a/src/lib/util/bitmap.cpp b/src/lib/util/bitmap.cpp
index 87cf8a27b76..ed814aae218 100644
--- a/src/lib/util/bitmap.cpp
+++ b/src/lib/util/bitmap.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "bitmap.h"
diff --git a/src/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp
index c2cded9f9aa..d2415108d80 100644
--- a/src/lib/util/cdrom.cpp
+++ b/src/lib/util/cdrom.cpp
@@ -16,11 +16,11 @@
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "cdrom.h"
-#include <stdlib.h>
+#include <cstdlib>
#include "chdcd.h"
diff --git a/src/lib/util/chd.cpp b/src/lib/util/chd.cpp
index 3b61d044cd3..d71eb436ea0 100644
--- a/src/lib/util/chd.cpp
+++ b/src/lib/util/chd.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "chd.h"
#include "avhuff.h"
@@ -17,9 +17,9 @@
#include "cdrom.h"
#include "coretmpl.h"
#include <zlib.h>
-#include <time.h>
-#include <stddef.h>
-#include <stdlib.h>
+#include <ctime>
+#include <cstddef>
+#include <cstdlib>
#include <new>
#include "eminline.h"
diff --git a/src/lib/util/chdcd.cpp b/src/lib/util/chdcd.cpp
index 85bd7cdad27..aafac22e968 100644
--- a/src/lib/util/chdcd.cpp
+++ b/src/lib/util/chdcd.cpp
@@ -7,9 +7,9 @@
***************************************************************************/
-#include <ctype.h>
-#include <stdlib.h>
-#include <assert.h>
+#include <cctype>
+#include <cstdlib>
+#include <cassert>
#include "osdcore.h"
#include "chd.h"
#include "chdcd.h"
diff --git a/src/lib/util/chdcodec.cpp b/src/lib/util/chdcodec.cpp
index 71763163a87..9785929d0bd 100644
--- a/src/lib/util/chdcodec.cpp
+++ b/src/lib/util/chdcodec.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "chd.h"
#include "hashing.h"
diff --git a/src/lib/util/corealloc.h b/src/lib/util/corealloc.h
index 222b1428307..5d1f055e19b 100644
--- a/src/lib/util/corealloc.h
+++ b/src/lib/util/corealloc.h
@@ -15,7 +15,7 @@
#include "osdcore.h"
-#include <stdlib.h>
+#include <cstdlib>
#include <cstddef>
#include <cstring>
diff --git a/src/lib/util/corefile.cpp b/src/lib/util/corefile.cpp
index 78a484c5511..5b8babfc33a 100644
--- a/src/lib/util/corefile.cpp
+++ b/src/lib/util/corefile.cpp
@@ -20,7 +20,7 @@
#include <cstring>
#include <iterator>
-#include <ctype.h>
+#include <cctype>
namespace util {
diff --git a/src/lib/util/corestr.cpp b/src/lib/util/corestr.cpp
index d0d5b576890..d4fc15b1bce 100644
--- a/src/lib/util/corestr.cpp
+++ b/src/lib/util/corestr.cpp
@@ -14,8 +14,8 @@
#include <algorithm>
#include <memory>
-#include <ctype.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdlib>
/*-------------------------------------------------
diff --git a/src/lib/util/corestr.h b/src/lib/util/corestr.h
index 1791ae6d226..ee319d69deb 100644
--- a/src/lib/util/corestr.h
+++ b/src/lib/util/corestr.h
@@ -18,7 +18,7 @@
#include <string>
-#include <string.h>
+#include <cstring>
/***************************************************************************
diff --git a/src/lib/util/coreutil.cpp b/src/lib/util/coreutil.cpp
index d973080e354..94ec6dec273 100644
--- a/src/lib/util/coreutil.cpp
+++ b/src/lib/util/coreutil.cpp
@@ -9,7 +9,7 @@
***************************************************************************/
#include "coreutil.h"
-#include <assert.h>
+#include <cassert>
#include <zlib.h>
diff --git a/src/lib/util/delegate.cpp b/src/lib/util/delegate.cpp
index 7b4ee8df76e..1ba81916030 100644
--- a/src/lib/util/delegate.cpp
+++ b/src/lib/util/delegate.cpp
@@ -8,9 +8,9 @@
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include <cstdint>
-#include <stdio.h>
+#include <cstdio>
#include "delegate.h"
diff --git a/src/lib/util/flac.cpp b/src/lib/util/flac.cpp
index 54a589ee2a2..7fce66c2bce 100644
--- a/src/lib/util/flac.cpp
+++ b/src/lib/util/flac.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "flac.h"
#include <new>
diff --git a/src/lib/util/harddisk.cpp b/src/lib/util/harddisk.cpp
index 5db97e3417b..e91759c44f2 100644
--- a/src/lib/util/harddisk.cpp
+++ b/src/lib/util/harddisk.cpp
@@ -8,10 +8,10 @@
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "harddisk.h"
#include "osdcore.h"
-#include <stdlib.h>
+#include <cstdlib>
/***************************************************************************
TYPE DEFINITIONS
diff --git a/src/lib/util/hash.cpp b/src/lib/util/hash.cpp
index ddb6f52ac5c..5808163b6b9 100644
--- a/src/lib/util/hash.cpp
+++ b/src/lib/util/hash.cpp
@@ -12,7 +12,7 @@
#include "hash.h"
#include "hashing.h"
-#include <ctype.h>
+#include <cctype>
namespace util {
diff --git a/src/lib/util/huffman.cpp b/src/lib/util/huffman.cpp
index d3a73315ea9..23b13bdaf09 100644
--- a/src/lib/util/huffman.cpp
+++ b/src/lib/util/huffman.cpp
@@ -96,8 +96,8 @@
***************************************************************************/
-#include <stdlib.h>
-#include <assert.h>
+#include <cstdlib>
+#include <cassert>
#include "coretmpl.h"
#include "huffman.h"
diff --git a/src/lib/util/jedparse.cpp b/src/lib/util/jedparse.cpp
index c2c9a139a6a..962a41a8ee0 100644
--- a/src/lib/util/jedparse.cpp
+++ b/src/lib/util/jedparse.cpp
@@ -16,10 +16,10 @@
***************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
#include "jedparse.h"
diff --git a/src/lib/util/md5.cpp b/src/lib/util/md5.cpp
index 712bd4a23f3..3e26d0c5b07 100644
--- a/src/lib/util/md5.cpp
+++ b/src/lib/util/md5.cpp
@@ -22,7 +22,7 @@
* Still in the public domain.
*/
-#include <string.h> /* for memcpy() */
+#include <cstring> /* for memcpy() */
#include "md5.h"
diff --git a/src/lib/util/opresolv.cpp b/src/lib/util/opresolv.cpp
index 05b8a5e8898..034f9418426 100644
--- a/src/lib/util/opresolv.cpp
+++ b/src/lib/util/opresolv.cpp
@@ -8,10 +8,10 @@
****************************************************************************/
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
+#include <cassert>
#include "pool.h"
#include "corestr.h"
diff --git a/src/lib/util/opresolv.h b/src/lib/util/opresolv.h
index 52030dc4336..3781b602393 100644
--- a/src/lib/util/opresolv.h
+++ b/src/lib/util/opresolv.h
@@ -43,7 +43,7 @@
#pragma once
-#include <stdlib.h>
+#include <cstdlib>
#include <vector>
#include <string>
diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp
index 65aac4a8883..5def23aa5ff 100644
--- a/src/lib/util/options.cpp
+++ b/src/lib/util/options.cpp
@@ -15,10 +15,10 @@
#include <locale>
#include <string>
-#include <assert.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cctype>
+#include <cstdarg>
+#include <cstdlib>
const int core_options::MAX_UNADORNED_OPTIONS;
diff --git a/src/lib/util/palette.cpp b/src/lib/util/palette.cpp
index 488f7f8a2d2..59a63b2c8f5 100644
--- a/src/lib/util/palette.cpp
+++ b/src/lib/util/palette.cpp
@@ -8,11 +8,11 @@
******************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "palette.h"
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
#include <algorithm>
diff --git a/src/lib/util/plaparse.cpp b/src/lib/util/plaparse.cpp
index d1e7c679f97..fbecd27232b 100644
--- a/src/lib/util/plaparse.cpp
+++ b/src/lib/util/plaparse.cpp
@@ -10,10 +10,10 @@
***************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
#include "jedparse.h"
#include "plaparse.h"
diff --git a/src/lib/util/png.cpp b/src/lib/util/png.cpp
index 6b13f4f9593..e3ebf10688f 100644
--- a/src/lib/util/png.cpp
+++ b/src/lib/util/png.cpp
@@ -21,8 +21,8 @@
#include <cmath>
#include <new>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
diff --git a/src/lib/util/pool.cpp b/src/lib/util/pool.cpp
index 606a7aea4b6..481b8b97f7f 100644
--- a/src/lib/util/pool.cpp
+++ b/src/lib/util/pool.cpp
@@ -8,9 +8,9 @@
***************************************************************************/
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdlib.h>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdlib>
#include "pool.h"
#include "coreutil.h"
diff --git a/src/lib/util/sha1.cpp b/src/lib/util/sha1.cpp
index fcda6ff9995..abc073cb6e8 100644
--- a/src/lib/util/sha1.cpp
+++ b/src/lib/util/sha1.cpp
@@ -27,9 +27,9 @@
#include "sha1.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
static unsigned int READ_UINT32(const uint8_t* data)
{
diff --git a/src/lib/util/unicode.h b/src/lib/util/unicode.h
index 46e1aec3496..9c727041db8 100644
--- a/src/lib/util/unicode.h
+++ b/src/lib/util/unicode.h
@@ -23,7 +23,7 @@
#include <string>
-#include <stdlib.h>
+#include <cstdlib>
diff --git a/src/lib/util/vbiparse.cpp b/src/lib/util/vbiparse.cpp
index bfd145dd99f..6b790ec7180 100644
--- a/src/lib/util/vbiparse.cpp
+++ b/src/lib/util/vbiparse.cpp
@@ -10,7 +10,7 @@
#include "osdcore.h"
#include "vbiparse.h"
-#include <math.h>
+#include <cmath>
#include <algorithm>
diff --git a/src/lib/util/xmlfile.cpp b/src/lib/util/xmlfile.cpp
index 1014a7b245c..012080c8335 100644
--- a/src/lib/util/xmlfile.cpp
+++ b/src/lib/util/xmlfile.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "xmlfile.h"
diff --git a/src/lib/util/zippath.cpp b/src/lib/util/zippath.cpp
index d8e90de11ff..2d44cfc4b4b 100644
--- a/src/lib/util/zippath.cpp
+++ b/src/lib/util/zippath.cpp
@@ -13,7 +13,7 @@
#include "corestr.h"
#include "osdcore.h"
-#include <stdlib.h>
+#include <cstdlib>
#include <cassert>
#include <cctype>