diff options
author | 2021-01-02 15:11:27 -0500 | |
---|---|---|
committer | 2021-01-02 15:18:15 -0500 | |
commit | 60e518cc505ad5de6331a5da0d8291346757b9bd (patch) | |
tree | 33e9ab6c897eacb273e6f9d41c5c0d1c9595c443 /src/osd/modules/file | |
parent | 78f93a270c2b8d013128a2a346bdf0b8f98700d9 (diff) |
Low-level #include overhaul
- vecstream.h: Revert changes made in aa29519528cb3dbdbfac56819bea670ed8c56c5d. The std::string_view conversion has been made a non-member function (util::buf_to_string_view) and moved to coretmpl.h.
- strformat.h: Remove the using declaration importing util::string_format into the global namespace. It has been moved to emucore.h and a few tool sources; other references have been qualified.
- osdcore.h: Split out file, directory and path classes and methods to a new header (osdfile.h), Doxygenizing the documentation comments.
- Disaggregate many #includes that were including other standard or custom headers. emu.h now includes basically the same things that it did, but other headers have been streamlined; for instance, emucore.h no longer stealth-includes osdcore.h several ways.
Diffstat (limited to 'src/osd/modules/file')
-rw-r--r-- | src/osd/modules/file/posixdir.cpp | 1 | ||||
-rw-r--r-- | src/osd/modules/file/posixdomain.cpp | 1 | ||||
-rw-r--r-- | src/osd/modules/file/posixfile.cpp | 1 | ||||
-rw-r--r-- | src/osd/modules/file/posixfile.h | 2 | ||||
-rw-r--r-- | src/osd/modules/file/posixsocket.cpp | 1 | ||||
-rw-r--r-- | src/osd/modules/file/stdfile.cpp | 1 | ||||
-rw-r--r-- | src/osd/modules/file/windir.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/file/winfile.h | 2 | ||||
-rw-r--r-- | src/osd/modules/file/winptty.cpp | 1 | ||||
-rw-r--r-- | src/osd/modules/file/winrtdir.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/file/winrtfile.h | 2 | ||||
-rw-r--r-- | src/osd/modules/file/winrtptty.cpp | 1 | ||||
-rw-r--r-- | src/osd/modules/file/winrtsocket.cpp | 1 | ||||
-rw-r--r-- | src/osd/modules/file/winsocket.cpp | 1 |
14 files changed, 14 insertions, 5 deletions
diff --git a/src/osd/modules/file/posixdir.cpp b/src/osd/modules/file/posixdir.cpp index 2a755a513fe..9cd29a84600 100644 --- a/src/osd/modules/file/posixdir.cpp +++ b/src/osd/modules/file/posixdir.cpp @@ -40,6 +40,7 @@ #define _DARWIN_C_SOURCE // to get DT_xxx on OS X #include "osdcore.h" +#include "osdfile.h" #include "modules/lib/osdlib.h" #include "util/strformat.h" diff --git a/src/osd/modules/file/posixdomain.cpp b/src/osd/modules/file/posixdomain.cpp index 633187819a7..13d564d1738 100644 --- a/src/osd/modules/file/posixdomain.cpp +++ b/src/osd/modules/file/posixdomain.cpp @@ -13,6 +13,7 @@ #include <cassert> #include <cerrno> #include <cstdio> +#include <cstring> #include <sys/select.h> #include <sys/socket.h> diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp index 764b148bc7d..a35f0fbd6d4 100644 --- a/src/osd/modules/file/posixfile.cpp +++ b/src/osd/modules/file/posixfile.cpp @@ -44,6 +44,7 @@ // MAME headers #include "posixfile.h" +#include "osdcore.h" #include "unicode.h" #include <cassert> diff --git a/src/osd/modules/file/posixfile.h b/src/osd/modules/file/posixfile.h index 6f585ff827a..d47c03d691e 100644 --- a/src/osd/modules/file/posixfile.h +++ b/src/osd/modules/file/posixfile.h @@ -9,7 +9,7 @@ //============================================================ -#include "osdcore.h" +#include "osdfile.h" #include <cstdint> #include <string> diff --git a/src/osd/modules/file/posixsocket.cpp b/src/osd/modules/file/posixsocket.cpp index edb95816077..2ce5ad05d5c 100644 --- a/src/osd/modules/file/posixsocket.cpp +++ b/src/osd/modules/file/posixsocket.cpp @@ -13,6 +13,7 @@ #include <cassert> #include <cerrno> #include <cstdio> +#include <cstring> #include <arpa/inet.h> #include <netdb.h> diff --git a/src/osd/modules/file/stdfile.cpp b/src/osd/modules/file/stdfile.cpp index 0bf38945f5a..74b4208505c 100644 --- a/src/osd/modules/file/stdfile.cpp +++ b/src/osd/modules/file/stdfile.cpp @@ -7,6 +7,7 @@ //============================================================ #include "osdcore.h" +#include "osdfile.h" #include <cassert> #include <cstdint> diff --git a/src/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp index 73bcae13f04..e03b13782fd 100644 --- a/src/osd/modules/file/windir.cpp +++ b/src/osd/modules/file/windir.cpp @@ -12,7 +12,7 @@ #include <tchar.h> // MAME headers -#include "osdcore.h" +#include "osdfile.h" #include "strformat.h" // MAMEOS headers diff --git a/src/osd/modules/file/winfile.h b/src/osd/modules/file/winfile.h index 9a6f1b8fc34..927cb299545 100644 --- a/src/osd/modules/file/winfile.h +++ b/src/osd/modules/file/winfile.h @@ -8,7 +8,7 @@ #ifndef MAME_OSD_WINDOWS_WINFILE_H #define MAME_OSD_WINDOWS_WINFILE_H -#include "osdcore.h" +#include "osdfile.h" #include <cstdint> #include <string> diff --git a/src/osd/modules/file/winptty.cpp b/src/osd/modules/file/winptty.cpp index d4207d1d73d..65650fd4bfe 100644 --- a/src/osd/modules/file/winptty.cpp +++ b/src/osd/modules/file/winptty.cpp @@ -11,6 +11,7 @@ #include <windows.h> #include <cstdlib> +#include <cstring> namespace { diff --git a/src/osd/modules/file/winrtdir.cpp b/src/osd/modules/file/winrtdir.cpp index 2d61097a3b4..f1ade923e81 100644 --- a/src/osd/modules/file/winrtdir.cpp +++ b/src/osd/modules/file/winrtdir.cpp @@ -12,10 +12,10 @@ #include <tchar.h> // MAME headers -#include "osdcore.h" #include "strformat.h" // MAMEOS headers +#include "osdfile.h" #include "strconv.h" #include "../../windows/winutil.h" diff --git a/src/osd/modules/file/winrtfile.h b/src/osd/modules/file/winrtfile.h index 9a6f1b8fc34..927cb299545 100644 --- a/src/osd/modules/file/winrtfile.h +++ b/src/osd/modules/file/winrtfile.h @@ -8,7 +8,7 @@ #ifndef MAME_OSD_WINDOWS_WINFILE_H #define MAME_OSD_WINDOWS_WINFILE_H -#include "osdcore.h" +#include "osdfile.h" #include <cstdint> #include <string> diff --git a/src/osd/modules/file/winrtptty.cpp b/src/osd/modules/file/winrtptty.cpp index b442409a79e..cda1f128503 100644 --- a/src/osd/modules/file/winrtptty.cpp +++ b/src/osd/modules/file/winrtptty.cpp @@ -10,6 +10,7 @@ #include <windows.h> #include <cstdlib> +#include <cstring> namespace { diff --git a/src/osd/modules/file/winrtsocket.cpp b/src/osd/modules/file/winrtsocket.cpp index 3e4880605bf..d66551870f9 100644 --- a/src/osd/modules/file/winrtsocket.cpp +++ b/src/osd/modules/file/winrtsocket.cpp @@ -14,6 +14,7 @@ #include <cassert> #include <cstdio> +#include <cstring> // standard windows headers #include <windows.h> diff --git a/src/osd/modules/file/winsocket.cpp b/src/osd/modules/file/winsocket.cpp index 9fd0bb31165..948e57db822 100644 --- a/src/osd/modules/file/winsocket.cpp +++ b/src/osd/modules/file/winsocket.cpp @@ -17,6 +17,7 @@ #include <cassert> #include <cstdio> +#include <cstring> // standard windows headers #include <windows.h> |