Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define wxTrap() as a macro for gcc on Intel platforms too.

Browse Source 
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:
Vadim Zeitlin
2015-01-24 22:08:36 +00:00
parent 0499b8375f
commit 54d2b38643
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/debug.h
View File

@@ -258,9 +258,16 @@ extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
// trap function itself which is not very useful. // trap function itself which is not very useful.
#ifdef __VISUALC__ #ifdef __VISUALC__
#define wxTrap() __debugbreak() #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(); extern WXDLLIMPEXP_BASE void wxTrap();
#endif // Win VisualC #endif
// Global flag used to indicate that assert macros should call wxTrap(): it // 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 // is set by the default assert handler if the user answers yes to the