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

disable warning about _set_se_translator() requiring /EHa for VC9 too (it was disabled for up to VC8)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-06 23:27:37 +00:00
parent 73df4a1e3c
commit 5470512797
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/seh.h
View File

@@ -55,11 +55,11 @@
// as division by 0 or access violation) to C++ pseudo-exceptions // as division by 0 or access violation) to C++ pseudo-exceptions
extern void wxSETranslator(unsigned int code, EXCEPTION_POINTERS *ep); extern void wxSETranslator(unsigned int code, EXCEPTION_POINTERS *ep);
// up to VC 7.1 this warning ("calling _set_se_translator() requires /EHa") // up to VC 9 this warning ("calling _set_se_translator() requires /EHa")
// is harmless and it's easier to suppress it than use different makefiles // is harmless and it's easier to suppress it than use different makefiles
// for VC5 and 6 (which don't support /EHa at all) and VC7 (which does // for VC5 and 6 (which don't support /EHa at all) and VC7 (which does
// accept it but it seems to change nothing for it anyhow) // accept it but it seems to change nothing for it anyhow)
#if __VISUALC__ <= 1310 #if __VISUALC__ < 1600
#pragma warning(disable: 4535) #pragma warning(disable: 4535)
#endif #endif

22
src/msw/main.cpp
View File

@@ -77,28 +77,6 @@ extern int wxEntryCleanupReal(int& argc, wxChar **argv);
// OnFatalException() if necessary // OnFatalException() if necessary
#if wxUSE_ON_FATAL_EXCEPTION #if wxUSE_ON_FATAL_EXCEPTION
#if defined(__VISUALC__) && !defined(__WXWINCE__)
// VC++ (at least from 4.0 up to version 7.1) is incredibly broken in that
// a "catch ( ... )" will *always* catch SEH exceptions in it even though
// it should have never been the case... to prevent such catches from
// stealing the exceptions from our wxGlobalSEHandler which is only called
// if the exception is not handled elsewhere, we have to also call it from
// a special SEH translator function which is called by VC CRT when a Win32
// exception occurs
// this warns that /EHa (async exceptions) should be used when using
// _set_se_translator but, in fact, this doesn't seem to change anything
// with VC++ up to 8.0
#if _MSC_VER <= 1400
#pragma warning(disable:4535)
#endif
// note that the SE translator must be called wxSETranslator!
#define DisableAutomaticSETranslator() _set_se_translator(wxSETranslator)
#else // !__VISUALC__
#define DisableAutomaticSETranslator()
#endif // __VISUALC__/!__VISUALC__
// global pointer to exception information, only valid inside OnFatalException, // global pointer to exception information, only valid inside OnFatalException,
// used by wxStackWalker and wxCrashReport // used by wxStackWalker and wxCrashReport
extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL; extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;