use C++ library includes (nw)

benchmarks/eminline_noasm.cpp

@@ -1,5 +1,5 @@
 #include "benchmark/benchmark_api.h"
-#include <time.h>
+#include <ctime>
 #include "osdcore.h"
 #include "osdcomm.h"
 #define MAME_NOASM 1

src/devices/bus/coco/coco_dwsock.cpp

@@ -3,8 +3,8 @@
 #include "emu.h"
 #include "coco_dwsock.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #ifdef __GNUC__
 #include <unistd.h>
 #endif

src/devices/bus/rs232/pty.cpp

@@ -4,7 +4,7 @@
 #include "emu.h"
 #include "pty.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 
 static constexpr int TIMER_POLL = 1;

src/devices/cpu/alph8201/8201dasm.cpp

@@ -22,7 +22,7 @@ cpu/alph8201/ will be removed when the alpha 8304 has been dumped.
 #include "emu.h"
 #include "8201dasm.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <stdexcept>
 
 

src/devices/cpu/drcbex64.cpp

@@ -166,7 +166,7 @@
 
 ***************************************************************************/
 
-#include <stddef.h>
+#include <cstddef>
 #include "emu.h"
 #include "debugger.h"
 #include "emuopts.h"

src/devices/cpu/drcbex86.cpp

@@ -82,7 +82,7 @@
 
 **************************************************************************/
 
-#include <stddef.h>
+#include <cstddef>
 #include "emu.h"
 #include "debugger.h"
 #include "emuopts.h"

src/devices/cpu/dsp56156/opcode.cpp

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Andrew Gardner
 #include "emu.h"
-#include <stdio.h>
+#include <cstdio>
 
 #include "opcode.h"
 

src/devices/cpu/dsp56156/tables.cpp

@@ -1,9 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Andrew Gardner
 #include "emu.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 
 #include "tables.h"
 #include "dsp56def.h"

src/devices/cpu/dsp56156/tables.h

@@ -3,8 +3,8 @@
 #ifndef DSP56156_TABLES_H
 #define DSP56156_TABLES_H
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "dsp56156.h"
 

src/devices/cpu/g65816/g65816cm.h

@@ -25,7 +25,7 @@
 /* ================================ INCLUDES ============================== */
 /* ======================================================================== */
 
-#include <limits.h>
+#include <climits>
 
 
 /* ======================================================================== */

src/devices/cpu/hpc/hpcdasm.cpp

@@ -15,7 +15,7 @@
 #include "hpcdasm.h"
 
 #include "util/strformat.h"
-#include <ctype.h>
+#include <cctype>
 
 using osd::u32;
 using util::BIT;

src/devices/cpu/i386/x87priv.h

@@ -5,7 +5,7 @@
 #ifndef __X87PRIV_H__
 #define __X87PRIV_H__
 
-#include <math.h>
+#include <cmath>
 
 
 /*************************************

src/devices/cpu/i860/i860dec.hxx

@@ -36,7 +36,7 @@
  *
  */
 #include "i860.h"
-#include <math.h>
+#include <cmath>
 
 
 #undef HOST_MSB

src/devices/cpu/i960/i960.cpp

@@ -7,7 +7,7 @@
 
 #ifdef _MSC_VER
 /* logb prototype is different for MS Visual C */
-#include <float.h>
+#include <cfloat>
 #define logb _logb
 #endif
 

src/devices/cpu/m37710/m37710cm.h

@@ -10,7 +10,7 @@
 /* ================================ INCLUDES ============================== */
 /* ======================================================================== */
 
-#include <limits.h>
+#include <climits>
 #include "m37710.h"
 
 

src/devices/cpu/m68000/m68kcpu.h

@@ -21,7 +21,7 @@
 #undef REG_SP
 #undef REG_PC
 #else
-#include <limits.h>
+#include <climits>
 #endif
 
 /* ======================================================================== */

src/devices/cpu/pic16c5x/16c5xdsm.cpp

@@ -26,7 +26,7 @@
 #include "emu.h"
 #include "16c5xdsm.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <stdexcept>
 
 

src/devices/cpu/pic16c62x/16c62xdsm.cpp

@@ -29,7 +29,7 @@
 #include "emu.h"
 #include "16c62xdsm.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <stdexcept>
 
 

src/devices/cpu/sc61860/readpc.cpp

@@ -7,7 +7,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #endif
-#include <stdio.h>
+#include <cstdio>
 #include <dos.h>
 
 // gcc -O

src/devices/cpu/sharc/compute.hxx

@@ -2,7 +2,7 @@
 // copyright-holders:Ville Linde
 /* compute operations */
 
-#include <math.h>
+#include <cmath>
 
 #define CLEAR_ALU_FLAGS()       (m_core->astat &= ~(AZ|AN|AV|AC|AS|AI))
 

src/devices/cpu/spc700/spc700.cpp

@@ -67,7 +67,7 @@ Address  Function Register  R/W  When Reset          Remarks
 
 #include "debugger.h"
 
-#include <limits.h>
+#include <climits>
 
 
 /* ======================================================================== */

src/devices/cpu/tms32010/32010dsm.cpp

@@ -27,7 +27,7 @@
 #include "emu.h"
 #include "32010dsm.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <stdexcept>
 
 

src/devices/cpu/tms32010/dis32010.cpp

@@ -11,8 +11,8 @@
 	*                                                                          *
 	\**************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "32010dsm.c"
 

src/devices/cpu/tms32025/32025dsm.cpp

@@ -33,7 +33,7 @@
 #include "emu.h"
 #include "32025dsm.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <stdexcept>
 
 

src/devices/cpu/z8000/makedab.cpp

@@ -1,6 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:Juergen Buchmueller,Ernesto Corvi
-#include <stdio.h>
+#include <cstdio>
 
 #define CF  0x100
 #define HF  0x200

src/devices/machine/corvushd.h

@@ -18,7 +18,7 @@
 #pragma once
 
 #include "imagedev/harddriv.h"
-#include <ctype.h>
+#include <cctype>
 
 class corvus_hdc_device :  public device_t
 {

src/devices/machine/ds1204.cpp

@@ -10,7 +10,7 @@
 #include "emu.h"
 #include "ds1204.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 
 #define VERBOSE_LEVEL ( 0 )

src/devices/machine/ds1205.cpp

@@ -10,7 +10,7 @@
 #include "emu.h"
 #include "ds1205.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 
 #define VERBOSE_LEVEL ( 0 )

src/devices/machine/ds1994.cpp

@@ -15,7 +15,7 @@
 #include "emu.h"
 #include "machine/ds1994.h"
 
-#include <time.h>
+#include <ctime>
 
 #define VERBOSE_LEVEL 0
 

src/devices/machine/ds2404.cpp

@@ -12,7 +12,7 @@
 #include "ds2404.h"
 
 #include <algorithm>
-#include <time.h> // FIXME: re-write in terms of device_rtc_interface and remove this
+#include <ctime> // FIXME: re-write in terms of device_rtc_interface and remove this
 
 
 //**************************************************************************

src/devices/machine/i8087.cpp

@@ -21,7 +21,7 @@
 
 #include "emu.h"
 #include "i8087.h"
-#include <math.h>
+#include <cmath>
 
 /*************************************
  *

src/devices/machine/k054321.cpp

@@ -33,7 +33,7 @@
 #include "emu.h"
 #include "k054321.h"
 
-#include <math.h>
+#include <cmath>
 
 DEFINE_DEVICE_TYPE(K054321, k054321_device, "k054321", "K054321 Maincpu-Soundcpu interface")
 

src/devices/machine/ram.cpp

@@ -12,8 +12,8 @@
 #include "ram.h"
 #include "emuopts.h"
 
-#include <stdio.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cctype>
 
 #include <algorithm>
 #include <functional>

src/devices/machine/tms9901.cpp

@@ -147,7 +147,7 @@ Clock mode:
 #include "emu.h"
 #include "tms9901.h"
 
-#include <math.h>
+#include <cmath>
 
 #define LOG_GENERAL  (1U << 0)
 #define LOG_PINS     (1U << 1)

src/devices/machine/tms9902.cpp

@@ -41,7 +41,7 @@
 #include "emu.h"
 #include "tms9902.h"
 
-#include <math.h>
+#include <cmath>
 
 #define LOG_GENERAL (1U << 0)
 #define LOG_LINES   (1U << 1)

src/devices/machine/wd2010.cpp

@@ -41,7 +41,7 @@ UNIMPLEMENTED FEATURES :
 #define VERBOSE 1
 #include "logmacro.h"
 
-#include <math.h>
+#include <cmath>
 //**************************************************************************
 //  MACROS / CONSTANTS
 //**************************************************************************

src/devices/sound/disc_mth.hxx

@@ -49,7 +49,7 @@
  *
  ************************************************************************/
 
-#include <float.h>
+#include <cfloat>
 
 
 

src/devices/sound/mea8000.cpp

@@ -30,7 +30,7 @@
 #include "emu.h"
 #include "mea8000.h"
 
-#include <math.h>
+#include <cmath>
 
 //#define VERBOSE 1
 #include "logmacro.h"

src/devices/video/poly.h

@@ -39,7 +39,7 @@
 
 #include "screen.h"
 
-#include <limits.h>
+#include <climits>
 #include <atomic>
 
 

src/emu/attotime.h

@@ -38,7 +38,7 @@
 #include "emucore.h"
 #include "xtal.h"
 
-#include <math.h>
+#include <cmath>
 #undef min
 #undef max
 

src/emu/debug/debugcmd.cpp

@@ -20,7 +20,7 @@
 #include "debugvw.h"
 #include "natkeyboard.h"
 #include "render.h"
-#include <ctype.h>
+#include <cctype>
 #include <algorithm>
 #include <fstream>
 

src/emu/debug/debugcon.cpp

@@ -14,7 +14,7 @@
 #include "debugvw.h"
 #include "textbuf.h"
 #include "debugger.h"
-#include <ctype.h>
+#include <cctype>
 #include <fstream>
 
 /***************************************************************************

src/emu/debug/debughlp.cpp

@@ -10,7 +10,7 @@
 
 #include "emu.h"
 #include "debughlp.h"
-#include <ctype.h>
+#include <cctype>
 
 
 

src/emu/debug/debugvw.cpp

@@ -19,7 +19,7 @@
 #include "dvwpoints.h"
 #include "debugcpu.h"
 #include "debugger.h"
-#include <ctype.h>
+#include <cctype>
 
 
 

src/emu/debug/dvmemory.cpp

@@ -15,7 +15,7 @@
 #include "debugger.h"
 
 #include <algorithm>
-#include <ctype.h>
+#include <cctype>
 #include <tuple>
 
 

src/emu/debug/express.cpp

@@ -31,7 +31,7 @@
 
 #include "emu.h"
 #include "express.h"
-#include <ctype.h>
+#include <cctype>
 
 
 

src/emu/debugger.cpp

@@ -14,7 +14,7 @@
 #include "debug/debugcmd.h"
 #include "debug/debugcon.h"
 #include "debug/debugvw.h"
-#include <ctype.h>
+#include <cctype>
 
 /***************************************************************************
     GLOBAL VARIABLES

src/emu/devcpu.cpp

@@ -10,7 +10,7 @@
 
 #include "emu.h"
 #include "emuopts.h"
-#include <ctype.h>
+#include <cctype>
 
 
 //**************************************************************************

src/emu/device.cpp

@@ -13,7 +13,7 @@
 #include "speaker.h"
 #include "debug/debugcpu.h"
 
-#include <string.h>
+#include <cstring>
 
 
 //**************************************************************************

src/emu/drivenum.cpp

@@ -14,7 +14,7 @@
 
 #include <algorithm>
 
-#include <ctype.h>
+#include <cctype>
 
 
 

src/emu/emucore.h

@@ -13,12 +13,12 @@
 #pragma once
 
 // standard C includes
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include <cassert>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <cstdarg>
 
 // some cleanups for Solaris for things defined in stdlib.h
 #if defined(__sun__) && defined(__svr4__)

src/emu/http.h

@@ -18,7 +18,7 @@ HTTP server handling
 #define MAME_EMU_HTTP_H
 
 #include <thread>
-#include <time.h>
+#include <ctime>
 #include "server_http.hpp"
 #include "server_ws.hpp"
 

src/emu/image.cpp

@@ -9,7 +9,7 @@
 
 ***************************************************************************/
 
-#include <ctype.h>
+#include <cctype>
 
 #include "emu.h"
 #include "emuopts.h"

src/emu/ioport.cpp

@@ -101,8 +101,8 @@
 
 #include "osdepend.h"
 
-#include <ctype.h>
-#include <time.h>
+#include <cctype>
+#include <ctime>
 
 
 namespace {

src/emu/ioport.h

@@ -21,7 +21,7 @@
 #include <cstdint>
 #include <cstring>
 #include <vector>
-#include <time.h>
+#include <ctime>
 
 
 //**************************************************************************

src/emu/machine.cpp

@@ -85,7 +85,7 @@
 #include "romload.h"
 #include "tilemap.h"
 #include "ui/uimain.h"
-#include <time.h>
+#include <ctime>
 #include <rapidjson/writer.h>
 #include <rapidjson/stringbuffer.h>
 

src/emu/machine.h

@@ -19,7 +19,7 @@
 
 #include <functional>
 
-#include <time.h>
+#include <ctime>
 
 //**************************************************************************
 //  CONSTANTS

src/emu/main.h

@@ -17,7 +17,7 @@
 #define MAME_EMU_MAIN_H
 
 #include <thread>
-#include <time.h>
+#include <ctime>
 
 //**************************************************************************
 //    CONSTANTS

src/emu/mconfig.cpp

@@ -12,7 +12,7 @@
 #include "emuopts.h"
 #include "screen.h"
 
-#include <ctype.h>
+#include <cctype>
 
 #include <cstring>
 #include <numeric>

src/emu/network.cpp

@@ -6,7 +6,7 @@
 
     Core network functions and definitions.
 ***************************************************************************/
-#include <ctype.h>
+#include <cctype>
 
 #include "emu.h"
 #include "network.h"

src/emu/render.h

@@ -48,7 +48,7 @@
 
 #include "screen.h"
 
-#include <math.h>
+#include <cmath>
 #include <array>
 #include <map>
 #include <memory>

src/emu/rendlay.cpp

@@ -18,7 +18,7 @@
 #include "vecstream.h"
 #include "xmlfile.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <algorithm>
 #include <cmath>
 #include <cstddef>

src/emu/rendutil.h

@@ -15,7 +15,7 @@
 
 #include "render.h"
 
-#include <math.h>
+#include <cmath>
 
 
 /* ----- image formats ----- */

src/emu/softlist_dev.cpp

@@ -15,7 +15,7 @@
 #include "softlist_dev.h"
 #include "validity.h"
 
-#include <ctype.h>
+#include <cctype>
 
 
 //**************************************************************************

src/emu/validity.cpp

@@ -15,7 +15,7 @@
 #include "romload.h"
 #include "video/rgbutil.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <type_traits>
 #include <typeinfo>
 

src/frontend/mame/cheat.cpp

@@ -87,7 +87,7 @@
 #include <iterator>
 #include <utility>
 
-#include <ctype.h>
+#include <cctype>
 
 
 

src/frontend/mame/clifront.cpp

@@ -36,7 +36,7 @@
 
 #include <algorithm>
 #include <new>
-#include <ctype.h>
+#include <cctype>
 
 
 //**************************************************************************

src/frontend/mame/infoxml.cpp

@@ -25,7 +25,7 @@
 
 #include "xmlfile.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <cstring>
 #include <unordered_set>
 #include <queue>

src/frontend/mame/mame.cpp

@@ -17,7 +17,7 @@
 #include "validity.h"
 #include "clifront.h"
 #include "luaengine.h"
-#include <time.h>
+#include <ctime>
 #include "ui/ui.h"
 #include "ui/selgame.h"
 #include "ui/simpleselgame.h"

src/frontend/mame/mameopts.cpp

@@ -18,7 +18,7 @@
 #include "hashfile.h"
 #include "clifront.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <stack>
 
 

src/frontend/mame/ui/simpleselgame.cpp

@@ -24,7 +24,7 @@
 #include "mame.h"
 #include "uiinput.h"
 
-#include <ctype.h>
+#include <cctype>
 
 
 namespace ui {

src/lib/formats/a26_cas.cpp

@@ -6,7 +6,7 @@ Atari 2600 SuperCharger support
 
 */
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/a26_cas.h"
 

src/lib/formats/a5105_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/a5105_dsk.h"
 

src/lib/formats/abc800_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/abc800_dsk.h"
 

src/lib/formats/abcfd2_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/abcfd2_dsk.h"
 

src/lib/formats/ace_tap.cpp

@@ -10,7 +10,7 @@ For more information see:
 
 ********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "ace_tap.h"
 

src/lib/formats/adam_cas.cpp

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Curt Coder
 
-#include <assert.h>
+#include <cassert>
 
 #include "cassimg.h"
 #include "adam_cas.h"

src/lib/formats/adam_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/adam_dsk.h"
 

src/lib/formats/agat840k_hle_dsk.cpp

@@ -12,7 +12,7 @@
 
 ************************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/agat840k_hle_dsk.h"
 

src/lib/formats/aim_dsk.cpp

@@ -12,7 +12,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "aim_dsk.h"
 

src/lib/formats/ami_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/ami_dsk.h"
 

src/lib/formats/ap2_dsk.cpp

@@ -8,9 +8,9 @@
 
 *********************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
+#include <cstdlib>
+#include <cstring>
+#include <cassert>
 
 #include "ap2_dsk.h"
 #include "basicdsk.h"

src/lib/formats/ap_dsk35.cpp

@@ -98,8 +98,8 @@
 
 *********************************************************************/
 
-#include <stdio.h>
-#include <assert.h>
+#include <cstdio>
+#include <cassert>
 
 #include "emu.h" // logerror
 #include "ap_dsk35.h"

src/lib/formats/apf_apt.cpp

@@ -34,7 +34,7 @@ e. A checksum byte (8-bit addition)
 
 ********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/apf_apt.h"
 

src/lib/formats/apollo_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/apollo_dsk.h"
 

src/lib/formats/applix_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/applix_dsk.h"
 

src/lib/formats/asst128_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/asst128_dsk.h"
 

src/lib/formats/atari_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/atari_dsk.h"
 

src/lib/formats/atom_tap.cpp

@@ -40,7 +40,7 @@
 
 */
 
-#include <assert.h>
+#include <cassert>
 
 #include "atom_tap.h"
 #include "csw_cas.h"

src/lib/formats/basicdsk.cpp

@@ -8,9 +8,9 @@
 
 *********************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
+#include <cstdlib>
+#include <cstring>
+#include <cassert>
 
 #include "basicdsk.h"
 

src/lib/formats/bw12_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/bw12_dsk.h"
 

src/lib/formats/bw2_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/bw2_dsk.h"
 

src/lib/formats/c3040_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/c3040_dsk.h"
 

src/lib/formats/c4040_dsk.cpp

@@ -8,7 +8,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/c4040_dsk.h"
 

src/lib/formats/camplynx_dsk.cpp

@@ -19,7 +19,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/camplynx_dsk.h"
 

src/lib/formats/cassimg.cpp

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#include <string.h>
-#include <assert.h>
+#include <cstring>
+#include <cassert>
 
 #include "imageutl.h"
 #include "cassimg.h"

src/lib/formats/cbm_tap.cpp

@@ -94,7 +94,7 @@ Unfortunately, I have no such a .tap file to test, so my implementation
 below could be not working.  FP ]
 */
 
-#include <assert.h>
+#include <cassert>
 
 #include "cbm_tap.h"
 

src/lib/formats/cgen_cas.cpp

@@ -19,7 +19,7 @@ We now support these three types below...
 
 ********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/cgen_cas.h"
 

src/lib/formats/comx35_dsk.cpp

@@ -36,7 +36,7 @@
 
 */
 
-#include <assert.h>
+#include <cassert>
 
 #include "formats/comx35_dsk.h"
 

src/lib/formats/concept_dsk.cpp

@@ -10,7 +10,7 @@
 
 *********************************************************************/
 
-#include <assert.h>
+#include <cassert>
 
 #include "flopimg.h"
 #include "formats/concept_dsk.h"