Define wxTrap() as a macro for gcc on Intel platforms too.
It is more convenient to break into the debugger at the exact location of the assert instead of inside a nested wxTrap() function. This does the same thing for gcc/x86 as was done for MSVC in r73124. See #11184. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -258,9 +258,16 @@ extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
|
||||
// trap function itself which is not very useful.
|
||||
#ifdef __VISUALC__
|
||||
#define wxTrap() __debugbreak()
|
||||
#else
|
||||
#elif defined(__GNUC__)
|
||||
#if defined(__i386) || defined(__x86_64)
|
||||
#define wxTrap() asm volatile ("int $3")
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef wxTrap
|
||||
// For all the other cases, use a generic function.
|
||||
extern WXDLLIMPEXP_BASE void wxTrap();
|
||||
#endif // Win VisualC
|
||||
#endif
|
||||
|
||||
// Global flag used to indicate that assert macros should call wxTrap(): it
|
||||
// is set by the default assert handler if the user answers yes to the
|
||||
|
Reference in New Issue
Block a user