summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2020-01-22 22:04:35 -0500
committer GitHub <noreply@github.com>2020-01-22 22:04:35 -0500
commit1a5b900759f491bf6b59be67b5446b0a1becb04b (patch)
tree460c3730885a66d8d38ae4998abc3642b8bbd6b7 /src/tools
parentdb157a165b71d659d55e6f0bb97278a57a4e8607 (diff)
parent399515c7a783f84b5c40c5e1733500b3d62bf634 (diff)
Merge pull request #6195 from firewave/includes
use C++ library includes (nw)
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/aueffectutil.mm2
-rw-r--r--src/tools/castool.cpp12
-rw-r--r--src/tools/chdman.cpp14
-rw-r--r--src/tools/floptool.cpp14
-rw-r--r--src/tools/imgtool/filtbas.cpp6
-rw-r--r--src/tools/imgtool/filteoln.cpp2
-rw-r--r--src/tools/imgtool/filter.cpp2
-rw-r--r--src/tools/imgtool/filter.h4
-rw-r--r--src/tools/imgtool/formats/coco_dsk.cpp6
-rw-r--r--src/tools/imgtool/formats/vt_dsk.cpp6
-rw-r--r--src/tools/imgtool/imgtool.cpp4
-rw-r--r--src/tools/imgtool/imgtool.h6
-rw-r--r--src/tools/imgtool/library.cpp2
-rw-r--r--src/tools/imgtool/library.h2
-rw-r--r--src/tools/imgtool/main.cpp10
-rw-r--r--src/tools/imgtool/modules/amiga.cpp6
-rw-r--r--src/tools/imgtool/modules/bml3.cpp6
-rw-r--r--src/tools/imgtool/modules/concept.cpp8
-rw-r--r--src/tools/imgtool/modules/fat.cpp4
-rw-r--r--src/tools/imgtool/modules/mac.cpp10
-rw-r--r--src/tools/imgtool/modules/macbin.cpp2
-rw-r--r--src/tools/imgtool/modules/os9.cpp2
-rw-r--r--src/tools/imgtool/modules/rsdos.cpp6
-rw-r--r--src/tools/imgtool/modules/rt11.cpp6
-rw-r--r--src/tools/imgtool/modules/thomson.cpp2
-rw-r--r--src/tools/imgtool/modules/ti99.cpp10
-rw-r--r--src/tools/imgtool/modules/ti990hd.cpp8
-rw-r--r--src/tools/imgtool/modules/vzdos.cpp8
-rw-r--r--src/tools/imgtool/stream.cpp4
-rw-r--r--src/tools/jedutil.cpp8
-rw-r--r--src/tools/ldresample.cpp10
-rw-r--r--src/tools/ldverify.cpp8
-rw-r--r--src/tools/pngcmp.cpp10
-rw-r--r--src/tools/regrep.cpp10
-rw-r--r--src/tools/romcmp.cpp4
-rw-r--r--src/tools/split.cpp10
-rw-r--r--src/tools/src2html.cpp10
-rw-r--r--src/tools/unidasm.cpp2
38 files changed, 123 insertions, 123 deletions
diff --git a/src/tools/aueffectutil.mm b/src/tools/aueffectutil.mm
index d232c735db3..661800a3b48 100644
--- a/src/tools/aueffectutil.mm
+++ b/src/tools/aueffectutil.mm
@@ -13,7 +13,7 @@
#include <utility>
#include <vector>
-#include <stdlib.h>
+#include <cstdlib>
#ifdef MAC_OS_X_VERSION_MAX_ALLOWED
diff --git a/src/tools/castool.cpp b/src/tools/castool.cpp
index 6c10cfe4ed8..eb9973ad48d 100644
--- a/src/tools/castool.cpp
+++ b/src/tools/castool.cpp
@@ -10,12 +10,12 @@
***************************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <time.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
+#include <cstdlib>
+#include <ctime>
+#include <cassert>
#include "corestr.h"
diff --git a/src/tools/chdman.cpp b/src/tools/chdman.cpp
index 153a4e34157..44e73083ff4 100644
--- a/src/tools/chdman.cpp
+++ b/src/tools/chdman.cpp
@@ -5,8 +5,8 @@
CHD compression frontend
****************************************************************************/
-#include <stdio.h> // must be here otherwise issues with I64FMT in MINGW
-#include <assert.h>
+#include <stdio.h> // must be stdio.h and here otherwise issues with I64FMT in MINGW
+#include <cassert>
#include "osdcore.h"
#include "corefile.h"
@@ -17,11 +17,11 @@
#include "md5.h"
#include "sha1.h"
#include "vbiparse.h"
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-#include <ctype.h>
+#include <cstdarg>
+#include <cstdlib>
+#include <cstdio>
+#include <ctime>
+#include <cctype>
#include <iostream>
#include <cassert>
diff --git a/src/tools/floptool.cpp b/src/tools/floptool.cpp
index 591fd5b91ad..7a09bd2ca34 100644
--- a/src/tools/floptool.cpp
+++ b/src/tools/floptool.cpp
@@ -10,13 +10,13 @@
***************************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <time.h>
-#include <stdarg.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
+#include <cstdlib>
+#include <ctime>
+#include <cstdarg>
+#include <cassert>
#include "corestr.h"
diff --git a/src/tools/imgtool/filtbas.cpp b/src/tools/imgtool/filtbas.cpp
index 37bf5f0ef71..4cffd0a34c3 100644
--- a/src/tools/imgtool/filtbas.cpp
+++ b/src/tools/imgtool/filtbas.cpp
@@ -18,9 +18,9 @@
*****************************************************************************/
-#include <string.h>
-#include <stdarg.h>
-#include <ctype.h>
+#include <cstring>
+#include <cstdarg>
+#include <cctype>
#include "imgtool.h"
#include "formats/imageutl.h"
diff --git a/src/tools/imgtool/filteoln.cpp b/src/tools/imgtool/filteoln.cpp
index bb589e8fafe..5a4c2f873a3 100644
--- a/src/tools/imgtool/filteoln.cpp
+++ b/src/tools/imgtool/filteoln.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
-#include <string.h>
+#include <cstring>
#include "imgtool.h"
diff --git a/src/tools/imgtool/filter.cpp b/src/tools/imgtool/filter.cpp
index e26c51a623b..df9c6ea28ac 100644
--- a/src/tools/imgtool/filter.cpp
+++ b/src/tools/imgtool/filter.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
-#include <string.h>
+#include <cstring>
#include "imgtool.h"
diff --git a/src/tools/imgtool/filter.h b/src/tools/imgtool/filter.h
index 7ddd999c2a2..e46d3781262 100644
--- a/src/tools/imgtool/filter.h
+++ b/src/tools/imgtool/filter.h
@@ -11,8 +11,8 @@
#ifndef FILTER_H
#define FILTER_H
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
#include "library.h"
diff --git a/src/tools/imgtool/formats/coco_dsk.cpp b/src/tools/imgtool/formats/coco_dsk.cpp
index 6f509c92767..4e5bc4aa7c6 100644
--- a/src/tools/imgtool/formats/coco_dsk.cpp
+++ b/src/tools/imgtool/formats/coco_dsk.cpp
@@ -8,9 +8,9 @@
*********************************************************************/
-#include <string.h>
-#include <time.h>
-#include <assert.h>
+#include <cstring>
+#include <ctime>
+#include <cassert>
#include "formats/coco_dsk.h"
#include "formats/basicdsk.h"
diff --git a/src/tools/imgtool/formats/vt_dsk.cpp b/src/tools/imgtool/formats/vt_dsk.cpp
index 02f74668b0f..c29d08ba88b 100644
--- a/src/tools/imgtool/formats/vt_dsk.cpp
+++ b/src/tools/imgtool/formats/vt_dsk.cpp
@@ -8,9 +8,9 @@
*********************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstring>
+#include <cassert>
#include "formats/vt_dsk.h"
#include "formats/basicdsk.h"
diff --git a/src/tools/imgtool/imgtool.cpp b/src/tools/imgtool/imgtool.cpp
index b51d7b4d478..fb24da8a872 100644
--- a/src/tools/imgtool/imgtool.cpp
+++ b/src/tools/imgtool/imgtool.cpp
@@ -8,8 +8,8 @@
***************************************************************************/
-#include <string.h>
-#include <ctype.h>
+#include <cstring>
+#include <cctype>
#include <iostream>
#include "imgtool.h"
diff --git a/src/tools/imgtool/imgtool.h b/src/tools/imgtool/imgtool.h
index aa4ae79e29e..614b3564dcf 100644
--- a/src/tools/imgtool/imgtool.h
+++ b/src/tools/imgtool/imgtool.h
@@ -11,9 +11,9 @@
#ifndef IMGTOOL_H
#define IMGTOOL_H
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cassert>
#include <functional>
#include "corestr.h"
diff --git a/src/tools/imgtool/library.cpp b/src/tools/imgtool/library.cpp
index 785054575b0..e3c75203805 100644
--- a/src/tools/imgtool/library.cpp
+++ b/src/tools/imgtool/library.cpp
@@ -9,7 +9,7 @@
****************************************************************************/
-#include <string.h>
+#include <cstring>
#include <algorithm>
#include "imgtool.h"
diff --git a/src/tools/imgtool/library.h b/src/tools/imgtool/library.h
index c709a70201b..6dc9ea8224b 100644
--- a/src/tools/imgtool/library.h
+++ b/src/tools/imgtool/library.h
@@ -17,7 +17,7 @@
#ifndef LIBRARY_H
#define LIBRARY_H
-#include <time.h>
+#include <ctime>
#include <list>
#include <chrono>
diff --git a/src/tools/imgtool/main.cpp b/src/tools/imgtool/main.cpp
index d5320beb347..d289bd01ff3 100644
--- a/src/tools/imgtool/main.cpp
+++ b/src/tools/imgtool/main.cpp
@@ -13,11 +13,11 @@
#include "modules.h"
#include "strformat.h"
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
+#include <cstdlib>
+#include <ctime>
#include <iostream>
#ifdef _WIN32
diff --git a/src/tools/imgtool/modules/amiga.cpp b/src/tools/imgtool/modules/amiga.cpp
index c1c5563012e..91488fb91a5 100644
--- a/src/tools/imgtool/modules/amiga.cpp
+++ b/src/tools/imgtool/modules/amiga.cpp
@@ -14,9 +14,9 @@
*****************************************************************************/
-#include <time.h>
-#include <string.h>
-#include <ctype.h>
+#include <ctime>
+#include <cstring>
+#include <cctype>
#include "imgtool.h"
#include "iflopimg.h"
diff --git a/src/tools/imgtool/modules/bml3.cpp b/src/tools/imgtool/modules/bml3.cpp
index a1a3bdc203d..19c60570acc 100644
--- a/src/tools/imgtool/modules/bml3.cpp
+++ b/src/tools/imgtool/modules/bml3.cpp
@@ -18,9 +18,9 @@
- (used with MP-1802 floppy disk controller card)
*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
#include "imgtool.h"
#include "iflopimg.h"
diff --git a/src/tools/imgtool/modules/concept.cpp b/src/tools/imgtool/modules/concept.cpp
index 6bc0fe1bf22..18b80c73c23 100644
--- a/src/tools/imgtool/modules/concept.cpp
+++ b/src/tools/imgtool/modules/concept.cpp
@@ -8,10 +8,10 @@
Raphael Nabet, 2003
*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <climits>
#include "imgtool.h"
struct UINT16xE
diff --git a/src/tools/imgtool/modules/fat.cpp b/src/tools/imgtool/modules/fat.cpp
index 029050d1e9c..68110275e07 100644
--- a/src/tools/imgtool/modules/fat.cpp
+++ b/src/tools/imgtool/modules/fat.cpp
@@ -134,8 +134,8 @@
****************************************************************************/
-#include <time.h>
-#include <ctype.h>
+#include <ctime>
+#include <cctype>
#include "imgtool.h"
#include "formats/imageutl.h"
#include "unicode.h"
diff --git a/src/tools/imgtool/modules/mac.cpp b/src/tools/imgtool/modules/mac.cpp
index 90c68323f76..f7bc2ff118b 100644
--- a/src/tools/imgtool/modules/mac.cpp
+++ b/src/tools/imgtool/modules/mac.cpp
@@ -89,11 +89,11 @@
*****************************************************************************/
-#include <ctype.h>
-#include <string.h>
-#include <time.h>
-#include <limits.h>
-#include <stddef.h>
+#include <cctype>
+#include <cstring>
+#include <ctime>
+#include <climits>
+#include <cstddef>
#include "formats/imageutl.h"
#include "imgtool.h"
diff --git a/src/tools/imgtool/modules/macbin.cpp b/src/tools/imgtool/modules/macbin.cpp
index 30400dffdbb..29fa90f9e59 100644
--- a/src/tools/imgtool/modules/macbin.cpp
+++ b/src/tools/imgtool/modules/macbin.cpp
@@ -46,7 +46,7 @@
*****************************************************************************/
-#include <string.h>
+#include <cstring>
#include "imgtool.h"
#include "formats/imageutl.h"
diff --git a/src/tools/imgtool/modules/os9.cpp b/src/tools/imgtool/modules/os9.cpp
index cc016250c31..539b53c1818 100644
--- a/src/tools/imgtool/modules/os9.cpp
+++ b/src/tools/imgtool/modules/os9.cpp
@@ -8,7 +8,7 @@
****************************************************************************/
-#include <time.h>
+#include <ctime>
#include "imgtool.h"
#include "formats/imageutl.h"
diff --git a/src/tools/imgtool/modules/rsdos.cpp b/src/tools/imgtool/modules/rsdos.cpp
index 4bcde9444ab..43579baad37 100644
--- a/src/tools/imgtool/modules/rsdos.cpp
+++ b/src/tools/imgtool/modules/rsdos.cpp
@@ -8,9 +8,9 @@
****************************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
#include "imgtool.h"
#include "formats/coco_dsk.h"
#include "iflopimg.h"
diff --git a/src/tools/imgtool/modules/rt11.cpp b/src/tools/imgtool/modules/rt11.cpp
index 01ab8741dd6..be6535550bb 100644
--- a/src/tools/imgtool/modules/rt11.cpp
+++ b/src/tools/imgtool/modules/rt11.cpp
@@ -75,9 +75,9 @@
#include "formats/imageutl.h"
#include "iflopimg.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
namespace
diff --git a/src/tools/imgtool/modules/thomson.cpp b/src/tools/imgtool/modules/thomson.cpp
index f122bc00520..2acb03d8b01 100644
--- a/src/tools/imgtool/modules/thomson.cpp
+++ b/src/tools/imgtool/modules/thomson.cpp
@@ -115,7 +115,7 @@
#include "iflopimg.h"
#include "formats/imageutl.h"
-#include <time.h>
+#include <ctime>
#define MAXSIZE 80*16*256*2 /* room for two faces, double-density, 80 tracks */
diff --git a/src/tools/imgtool/modules/ti99.cpp b/src/tools/imgtool/modules/ti99.cpp
index 226adc213d2..8ca2d49c529 100644
--- a/src/tools/imgtool/modules/ti99.cpp
+++ b/src/tools/imgtool/modules/ti99.cpp
@@ -18,11 +18,11 @@
- check allocation bitmap against corruption when an image is opened
*/
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
+#include <climits>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <ctime>
#include "imgtool.h"
#include "harddisk.h"
#include "imghd.h"
diff --git a/src/tools/imgtool/modules/ti990hd.cpp b/src/tools/imgtool/modules/ti990hd.cpp
index 6a9a37063b0..9bf77fa6a6c 100644
--- a/src/tools/imgtool/modules/ti990hd.cpp
+++ b/src/tools/imgtool/modules/ti990hd.cpp
@@ -8,10 +8,10 @@
Raphael Nabet, 2003
*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <climits>
#include "imgtool.h"
/* Max sector length is bytes. Generally 256, except for a few older disk
diff --git a/src/tools/imgtool/modules/vzdos.cpp b/src/tools/imgtool/modules/vzdos.cpp
index bf46863bb28..6a9d5b0c394 100644
--- a/src/tools/imgtool/modules/vzdos.cpp
+++ b/src/tools/imgtool/modules/vzdos.cpp
@@ -8,10 +8,10 @@
****************************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
#include "imgtool.h"
#include "formats/imageutl.h"
#include "formats/vt_dsk.h"
diff --git a/src/tools/imgtool/stream.cpp b/src/tools/imgtool/stream.cpp
index 9a29180c9da..9f6cba27353 100644
--- a/src/tools/imgtool/stream.cpp
+++ b/src/tools/imgtool/stream.cpp
@@ -8,8 +8,8 @@
***************************************************************************/
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <zlib.h>
#include "unzip.h"
diff --git a/src/tools/jedutil.cpp b/src/tools/jedutil.cpp
index d1c49ec7a79..49b5d00cd38 100644
--- a/src/tools/jedutil.cpp
+++ b/src/tools/jedutil.cpp
@@ -112,10 +112,10 @@
***************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
#include "corestr.h"
#include "jedparse.h"
#include "plaparse.h"
diff --git a/src/tools/ldresample.cpp b/src/tools/ldresample.cpp
index 5386ac31229..57c20f7777c 100644
--- a/src/tools/ldresample.cpp
+++ b/src/tools/ldresample.cpp
@@ -8,12 +8,12 @@
****************************************************************************/
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cctype>
+#include <cstdlib>
+#include <cmath>
#include <new>
-#include <assert.h>
+#include <cassert>
#include "bitmap.h"
#include "chd.h"
#include "avhuff.h"
diff --git a/src/tools/ldverify.cpp b/src/tools/ldverify.cpp
index 2a326508323..deee9afba36 100644
--- a/src/tools/ldverify.cpp
+++ b/src/tools/ldverify.cpp
@@ -8,11 +8,11 @@
****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cctype>
#include <new>
-#include <assert.h>
+#include <cassert>
#include "coretmpl.h"
#include "aviio.h"
#include "avhuff.h"
diff --git a/src/tools/pngcmp.cpp b/src/tools/pngcmp.cpp
index af104e928b3..eb56d4a7ee7 100644
--- a/src/tools/pngcmp.cpp
+++ b/src/tools/pngcmp.cpp
@@ -8,11 +8,11 @@
****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
+#include <cassert>
#include "osdcore.h"
#include "png.h"
diff --git a/src/tools/regrep.cpp b/src/tools/regrep.cpp
index 91dcaecd518..f45351272a7 100644
--- a/src/tools/regrep.cpp
+++ b/src/tools/regrep.cpp
@@ -6,12 +6,12 @@
****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
#include <new>
-#include <assert.h>
+#include <cassert>
#include "osdcore.h"
#include "png.h"
diff --git a/src/tools/romcmp.cpp b/src/tools/romcmp.cpp
index 6a781bc8c29..9f072fc0e4f 100644
--- a/src/tools/romcmp.cpp
+++ b/src/tools/romcmp.cpp
@@ -13,8 +13,8 @@
#include "osdcomm.h"
#include "hash.h"
-#include <stdarg.h>
-#include <stdlib.h>
+#include <cstdarg>
+#include <cstdlib>
#define MAX_FILES 1000
diff --git a/src/tools/split.cpp b/src/tools/split.cpp
index 4ef18b6ad06..ba455c04b51 100644
--- a/src/tools/split.cpp
+++ b/src/tools/split.cpp
@@ -8,11 +8,11 @@
****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
+#include <cassert>
#include "corefile.h"
#include "corestr.h"
#include "sha1.h"
diff --git a/src/tools/src2html.cpp b/src/tools/src2html.cpp
index 32a21de065e..7b0293ac4b1 100644
--- a/src/tools/src2html.cpp
+++ b/src/tools/src2html.cpp
@@ -15,11 +15,11 @@
***************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
+#include <cassert>
#include "osdcore.h"
#include "corestr.h"
#include "corefile.h"
diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp
index f45dafcc9b3..4401e0c3f83 100644
--- a/src/tools/unidasm.cpp
+++ b/src/tools/unidasm.cpp
@@ -178,7 +178,7 @@ using util::BIT;
#include <iostream>
#include <stdexcept>
-#include <ctype.h>
+#include <cctype>
using u8 = util::u8;
using u16 = util::u16;