ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compiler warning to use enum class instead of enum

This commit is contained in:
RadWolfie 2020-06-09 23:17:53 -05:00
parent dbae5dbb79
commit c0f2d60a3f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/Logging.cpp
View File

@ -251,19 +251,19 @@ void CxbxPopupMessageEx(CXBXR_MODULE cxbxr_module, LOG_LEVEL level, CxbxMsgDlgIc
UINT uType = MB_OK | MB_TOPMOST | MB_SETFOREGROUND;
switch (icon) {
case CxbxMsgDlgIcon_Warn: {
case CxbxMsgDlgIcon::Warn: {
uType |= MB_ICONWARNING;
break;
}
case CxbxMsgDlgIcon_Error: {
case CxbxMsgDlgIcon::Error: {
uType |= MB_ICONERROR;
break;
}
case CxbxMsgDlgIcon_Info: {
case CxbxMsgDlgIcon::Info: {
uType |= MB_ICONINFORMATION;
break;
}
case CxbxMsgDlgIcon_Unknown:
case CxbxMsgDlgIcon::Unknown:
default: {
uType |= MB_ICONQUESTION;
break;

4
src/common/Logging.h
View File

@ -130,9 +130,9 @@ extern inline void log_sync_config();
void log_set_config(int LogLevel, unsigned int* LoggedModules, bool LogPopupTestcase);
void log_generate_active_filter_output(const CXBXR_MODULE cxbxr_module);
void log_generate_active_filter_output(const CXBXR_MODULE cxbxr_module);
typedef enum _CxbxMsgDlgIcon {
typedef enum class _CxbxMsgDlgIcon {
Info = 0,
Warn,
Error,

2
src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -600,7 +600,7 @@ VOID CxbxInitWindow(bool bFullInit)
if (hRenderWindowThread == NULL) {
char szBuffer[1024] = { 0 };
sprintf(szBuffer, "Creating EmuRenderWindowThread Failed: %08X", GetLastError());
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon_Error, szBuffer);
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon::Error, szBuffer);
EmuShared::Cleanup();
ExitProcess(0);
}

2
src/core/kernel/exports/EmuKrnlRtl.cpp
View File

@ -243,7 +243,7 @@ XBSYSAPI EXPORTNUM(264) xboxkrnl::VOID NTAPI xboxkrnl::RtlAssert
ss << ")";
CxbxPopupMessage(LOG_LEVEL::WARNING, CxbxMsgDlgIcon_Warn, ss.str().c_str());
CxbxPopupMessage(LOG_LEVEL::WARNING, CxbxMsgDlgIcon::Warn, ss.str().c_str());
}
// ******************************************************************