Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

main: remove __try (non-portable). wdbg exception handler will cover it. if that needs to be debugged, add __try in win.cpp around call to main()

Browse Source 
This was SVN commit r1817.
This commit is contained in:
janwas 2005-01-25 18:56:43 +00:00
parent 711bff0d3a
commit c12c6a0e4d
1 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source/main.cpp
View File

@ -1288,16 +1288,6 @@ static void Frame()
}
// Choose when to override the standard exception handling behaviour
// (opening the debugger when available, or crashing when not) with
// code that generates a crash log/dump.
#if defined(_WIN32) && ( defined(NDEBUG) || defined(TESTING) )
# define CUSTOM_EXCEPTION_HANDLER
#endif
#ifdef CUSTOM_EXCEPTION_HANDLER
#include <excpt.h>
#endif
#ifndef SCED
@ -1305,38 +1295,26 @@ int main(int argc, char* argv[])
{
MICROLOG(L"In main");
#ifdef CUSTOM_EXCEPTION_HANDLER
__try
{
#endif
MICROLOG(L"Init");
Init(argc, argv, true);
MICROLOG(L"Init");
Init(argc, argv, true);
// Do some limited tests to ensure things aren't broken
// Do some limited tests to ensure things aren't broken
#ifndef NDEBUG
{
extern void PerformTests();
PerformTests();
}
#endif
while(!quit)
{
MICROLOG(L"(Simulation) Frame");
Frame();
}
//_CrtMemDumpAllObjectsSince(NULL);
MICROLOG(L"Shutdown");
Shutdown();
#ifdef CUSTOM_EXCEPTION_HANDLER
}
__except(debug_main_exception_filter(GetExceptionCode(), GetExceptionInformation()))
{
extern void PerformTests();
PerformTests();
}
#endif
while(!quit)
{
MICROLOG(L"(Simulation) Frame");
Frame();
}
MICROLOG(L"Shutdown");
Shutdown();
exit(0);
}