summaryrefslogtreecommitdiffstats
path: root/src/osd/windows/winmain.cpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-02-14 11:05:57 -0500
committer AJR <ajrhacker@users.noreply.github.com>2021-02-14 11:05:57 -0500
commitbc0146c2038c46f789a246d5616afd7c425157f3 (patch)
treeb4d39194034b4c6e56ccd4035d25636034be43ca /src/osd/windows/winmain.cpp
parent91310bcdeb7ab0ff661738b212017bf836f4e8ad (diff)
Eliminate ARRAY_LENGTH template in favor of C++17's std::size
* osdcomm.h: Move definition of EQUIVALENT_ARRAY to coretmpl.h * sharc.cpp, gt64xxx.cpp, ym2413.cpp, gb_lcd.cpp, snes_ppu.cpp: Use STRUCT_MEMBER for save state registration * gio/newport.cpp, megadrive/svp.cpp, nes_ctrl/bcbattle.cpp, arm7.cpp, tms9995.cpp, pckeybrd.cpp, sa1110.cpp, sa1111.cpp, jangou_blitter.cpp, vic4567.cpp: Use std::fill(_n) instead of memset * emucore.h: Remove obsolete typedef
Diffstat (limited to 'src/osd/windows/winmain.cpp')
-rw-r--r--src/osd/windows/winmain.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp
index c423108a0f0..57b43116bd4 100644
--- a/src/osd/windows/winmain.cpp
+++ b/src/osd/windows/winmain.cpp
@@ -97,7 +97,7 @@ public:
char buffer[2048];
if (channel == OSD_OUTPUT_CHANNEL_ERROR)
{
- vsnprintf(buffer, ARRAY_LENGTH(buffer), msg, args);
+ vsnprintf(buffer, std::size(buffer), msg, args);
std::wstring wcbuffer(osd::text::to_wstring(buffer));
std::wstring wcappname(osd::text::to_wstring(emulator_info::get_appname()));
@@ -107,7 +107,7 @@ public:
}
else if (channel == OSD_OUTPUT_CHANNEL_VERBOSE)
{
- vsnprintf(buffer, ARRAY_LENGTH(buffer), msg, args);
+ vsnprintf(buffer, std::size(buffer), msg, args);
std::wstring wcbuffer = osd::text::to_wstring(buffer);
OutputDebugString(wcbuffer.c_str());
@@ -421,7 +421,7 @@ void MameMainApp::Run()
GetModuleFileNameA(nullptr, exe_path, MAX_PATH);
char* args[3] = { exe_path, (char*)"-verbose", (char*)"-mouse" };
- DWORD result = emulator_info::start_frontend(*m_options.get(), *m_osd.get(), ARRAY_LENGTH(args), args);
+ DWORD result = emulator_info::start_frontend(*m_options.get(), *m_osd.get(), std::size(args), args);
osd_output::pop(&winerror);
}