From: <sv...@op...> - 2024-05-08 06:13:16
|
Author: manx Date: Wed May 8 08:13:04 2024 New Revision: 20728 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20728 Log: Merged revision(s) 20725 from trunk/OpenMPT: [Fix] Static (internal linkage) functions in namespace scope in headers can cause ODR-violations when used by external linkage inline functions. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/misc/WriteMemoryDump.h Modified: branches/OpenMPT-1.31/misc/WriteMemoryDump.h ============================================================================== --- branches/OpenMPT-1.31/misc/WriteMemoryDump.h Wed May 8 08:12:38 2024 (r20727) +++ branches/OpenMPT-1.31/misc/WriteMemoryDump.h Wed May 8 08:13:04 2024 (r20728) @@ -23,7 +23,7 @@ OPENMPT_NAMESPACE_BEGIN -static bool WriteMemoryDump(_EXCEPTION_POINTERS *pExceptionInfo, const TCHAR *filename, bool fullMemDump) +inline bool WriteMemoryDump(_EXCEPTION_POINTERS *pExceptionInfo, const TCHAR *filename, bool fullMemDump) { using MINIDUMPWRITEDUMP = BOOL(WINAPI *)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam); |