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

removing attribute, as assert is not guaranteed not to return, but may just go on

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-06-14 15:07:14 +00:00
parent b625fff509
commit 2b760b6bc1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/debug.h
View File

@@ -178,18 +178,18 @@ inline void wxDisableAsserts() { wxSetAssertHandler(NULL); }
// //
// also notice that these functions can't be inline as wxString is not defined // also notice that these functions can't be inline as wxString is not defined
// yet (and can't be as wxString code itself may use assertions) // yet (and can't be as wxString code itself may use assertions)
extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
int line, int line,
const char *func, const char *func,
const char *cond); const char *cond);
extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
int line, int line,
const char *func, const char *func,
const char *cond, const char *cond,
const char *msg); const char *msg);
extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
int line, int line,
const char *func, const char *func,
const char *cond, const char *cond,
@@ -199,7 +199,7 @@ extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
// this version is for compatibility with wx 2.8 Unicode build only, we don't // this version is for compatibility with wx 2.8 Unicode build only, we don't
// use it ourselves any more except in ANSI-only build in which case it is all // use it ourselves any more except in ANSI-only build in which case it is all
// we need // we need
extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file, extern WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file,
int line, int line,
const char *func, const char *func,
const wxChar *cond, const wxChar *cond,
@@ -208,24 +208,24 @@ extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file
// these overloads work when msg passed to debug macro is a string and we // these overloads work when msg passed to debug macro is a string and we
// also have to provide wxCStrData overload to resolve ambiguity which would // also have to provide wxCStrData overload to resolve ambiguity which would
// otherwise arise from wxASSERT( s.c_str() ) // otherwise arise from wxASSERT( s.c_str() )
extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file, extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file,
int line, int line,
const wxString& func, const wxString& func,
const wxString& cond, const wxString& cond,
const wxString& msg); const wxString& msg);
extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file, extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file,
int line, int line,
const wxString& func, const wxString& func,
const wxString& cond); const wxString& cond);
extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
int line, int line,
const char *func, const char *func,
const char *cond, const char *cond,
const wxCStrData& msg); const wxCStrData& msg);
extern WX_ATTRIBUTE_NORETURN WXDLLIMPEXP_BASE void wxOnAssert(const char *file, extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
int line, int line,
const char *func, const char *func,
const char *cond, const char *cond,