amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in vc9: use _wassert instead of _assert, the latter no longer exists.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1511 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-10-03 15:27:40 +00:00
parent 9b438daf41
commit 75f73db8a9
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+5 -6
View File
@@ -275,15 +275,14 @@ void MSE::HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent& even
#if defined(_MSC_VER) && defined(_DEBUG) #if defined(_MSC_VER) && defined(_DEBUG)
// Print assert failures to debug output // Print assert failures to debug output
void msvc_assert(const char*, const char*, const char*, unsigned);
void MSE::OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg) { void MSE::OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg) {
#ifdef UNICODE #ifdef UNICODE
char file_[1024]; wcstombs(file_,file,1023);
char cond_[1024]; wcstombs(cond_,cond,1023);
char msg_ [1024]; wcstombs(msg_, msg, 1023);
msvc_assert(msg_, cond_, file_, line);
#else
msvc_assert(msg, cond, file, line); msvc_assert(msg, cond, file, line);
#else
wchar_t file_[1024]; mbstowcs(file_,file,1023);
wchar_t cond_[1024]; mbstowcs(cond_,cond,1023);
wchar_t msg_ [1024]; mbstowcs(msg_, msg, 1023);
msvc_assert(msg_, cond_, file_, line);
#endif #endif
} }
#endif #endif