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

kernel: replace __declspec(noreturn) to C++'s [[noreturn]] usage

This commit is contained in:
RadWolfie 2021-08-20 11:58:10 -05:00
parent 9bf21223f2
commit bc6c017b7a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/kernel/init/CxbxKrnl.cpp
View File

@ -1005,7 +1005,7 @@ static bool CxbxrKrnlPrepareXbeMap()
}
/*! initialize emulation */
static __declspec(noreturn) void CxbxrKrnlInit(
[[noreturn]] static void CxbxrKrnlInit(
void* pTLSData,
Xbe::TLS* pTLS,
Xbe::LibraryVersion* LibraryVersion,
@ -1244,7 +1244,7 @@ static void CxbxrKrnlInitHacks()
g_SkipRdtscPatching = !!HackEnabled;
}
static __declspec(noreturn) void CxbxrKrnlInit
[[noreturn]] static void CxbxrKrnlInit
(
void *pTLSData,
Xbe::TLS *pTLS,
@ -1537,7 +1537,7 @@ static __declspec(noreturn) void CxbxrKrnlInit
}
};*/
__declspec(noreturn) void CxbxrKrnlAbortEx(CXBXR_MODULE cxbxr_module, const char *szErrorMessage, ...)
[[noreturn]] void CxbxrKrnlAbortEx(CXBXR_MODULE cxbxr_module, const char *szErrorMessage, ...)
{
g_bEmuException = true;
@ -1759,7 +1759,7 @@ void CxbxPrintUEMInfo(ULONG ErrorCode)
}
}
__declspec(noreturn) void CxbxKrnlTerminateThread()
[[noreturn]] void CxbxKrnlTerminateThread()
{
TerminateThread(GetCurrentThread(), 0);
}

4
src/core/kernel/init/CxbxKrnl.h
View File

@ -147,7 +147,7 @@ bool HandleFirstLaunch();
void CxbxKrnlEmulate(unsigned int system, blocks_reserved_t blocks_reserved);
/*! cleanup emulation */
__declspec(noreturn) void CxbxrKrnlAbortEx(CXBXR_MODULE cxbxr_module, const char *szErrorMessage, ...);
[[noreturn]] void CxbxrKrnlAbortEx(CXBXR_MODULE cxbxr_module, const char *szErrorMessage, ...);
#define CxbxrKrnlAbort(fmt, ...) CxbxrKrnlAbortEx(LOG_PREFIX, fmt, ##__VA_ARGS__)
@ -170,7 +170,7 @@ void CxbxKrnlPrintUEM(ULONG ErrorCode);
void CxbxPrintUEMInfo(ULONG ErrorCode);
/*! terminate the calling thread */
__declspec(noreturn) void CxbxKrnlTerminateThread();
[[noreturn]] void CxbxKrnlTerminateThread();
/*! kernel panic (trap for unimplemented kernel functions) */
void CxbxKrnlPanic();