amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 21:27:01 -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@1508 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-10-02 13:42:31 +00:00
parent cc43ea3940
commit ca7ade0cfd
1 changed files with 187 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/error.cpp
+6 -6
View File
@@ -19,18 +19,18 @@ DECLARE_TYPEOF_COLLECTION(ScriptParseError);
// ----------------------------------------------------------------------------- : Debug utilities // ----------------------------------------------------------------------------- : Debug utilities
#if defined(_MSC_VER) && defined(_DEBUG) #if defined(_MSC_VER) && defined(_DEBUG)
void msvc_assert(const char* msg, const char* expr, const char* file, unsigned line) { void msvc_assert(const wchar_t* msg, const wchar_t* expr, const wchar_t* file, unsigned line) {
if (IsDebuggerPresent()) { if (IsDebuggerPresent()) {
char buffer[1024]; wchar_t buffer[1024];
if (msg) { if (msg) {
sprintf(buffer, "Assertion failed: %s: %s, file %s, line %d\n", msg, expr, file, line); wsprintf(buffer, L"Assertion failed: %s: %s, file %s, line %d\n", msg, expr, file, line);
} else { } else {
sprintf(buffer, "Assertion failed: %s, file %s, line %d\n", expr, file, line); wsprintf(buffer, L"Assertion failed: %s, file %s, line %d\n", expr, file, line);
} }
OutputDebugStringA(buffer); OutputDebugStringW(buffer);
DebugBreak(); DebugBreak();
} else { } else {
_assert(expr, file, line); _wassert(expr, file, line);
} }
} }
#endif #endif