X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=f64f350e83e362b1d0cde831a7f0f542e52388b2;hb=cfc8e0b7b15ea505bd6a6a9599cbc5ce1e316963;hp=cc9946cb32c7410a3f8e30fbd568728b55ee2c82;hpb=d61601ce7f87044c8ddd1e097d8d8743f06e84b4;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index cc9946c..f64f350 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -19,6 +19,11 @@ using namespace std;
 
 namespace Msp {
 
+Application::Application():
+	exit_code(0),
+	loop_mode_(TICK_SLEEP)
+{ }
+
 /**
 Constructs an instance of the registered application class and runs it.  If the
 application throws a UsageError, the static usage() function is called.
@@ -66,7 +71,7 @@ int Application::run(int argc, char **argv, void *data)
 
 #ifdef WIN32
 		string msg=Debug::demangle(typeid(e).name())+":\n"+e.what();
-		MessageBox(0, msg.c_str(), "Uncaught exception", MB_OK|MB_ICONERROR);
+		MessageBoxA(0, msg.c_str(), "Uncaught exception", MB_OK|MB_ICONERROR);
 #else
 		cerr<<"An uncaught exception occurred.\n";
 		cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
@@ -76,14 +81,9 @@ int Application::run(int argc, char **argv, void *data)
 		if(exc && !exc->get_backtrace().get_frames().empty())
 		{
 			cerr<<"  backtrace:\n";
-			const Debug::Backtrace::FrameSeq &frames=exc->get_backtrace().get_frames();
-			for(Debug::Backtrace::FrameSeq::const_iterator i=frames.begin(); i!=frames.end(); ++i)
-			{
-				cerr<<"    "<<i->address;
-				if(!i->symbol.empty())
-					cerr<<" in "<<i->symbol;
-				cerr<<" from "<<i->file<<'\n';
-			}
+			const list<Debug::Backtrace::StackFrame> &frames=exc->get_backtrace().get_frames();
+			for(list<Debug::Backtrace::StackFrame>::const_iterator i=frames.begin(); i!=frames.end(); ++i)
+				cerr<<"    "<<*i<<'\n';
 		}
 #endif
 
@@ -106,11 +106,6 @@ void Application::usage(const char *reason, const char *, bool)
 	cerr<<"The programmer was lazy and didn't write a usage() function for this application.\n";
 }
 
-Application::Application():
-	exit_code(0),
-	loop_mode_(TICK_SLEEP)
-{ }
-
 /**
 Default main loop.  Behavior depends on loop_mode_.  A custom main loop should
 monitor the done member variable and return exit_code.
@@ -198,6 +193,7 @@ void Application::sighandler_(int s)
 	app_->sighandler(s);
 }
 
+
 Application::RegBase::RegBase()
 {
 	if(reg_app_)