From bddffe4de070f28bcc1def8bfc5f86dc385aa81f Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 24 Aug 2008 21:35:30 +0000
Subject: [PATCH] Improve BackTrace printing

---
 source/core/application.cpp |  7 +------
 source/debug/backtrace.cpp  | 12 +++++++++++-
 source/debug/backtrace.h    |  1 +
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/source/core/application.cpp b/source/core/application.cpp
index cc9946c..82134df 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -78,12 +78,7 @@ int Application::run(int argc, char **argv, void *data)
 			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';
-			}
+				cerr<<"    "<<*i<<'\n';
 		}
 #endif
 
diff --git a/source/debug/backtrace.cpp b/source/debug/backtrace.cpp
index 5e96005..fe7dbff 100644
--- a/source/debug/backtrace.cpp
+++ b/source/debug/backtrace.cpp
@@ -52,7 +52,17 @@ ostream &operator<<(ostream &out, const Backtrace &bt)
 {
 	const Backtrace::FrameSeq &frames=bt.get_frames();
 	for(Backtrace::FrameSeq::const_iterator i=frames.begin(); i!=frames.end(); ++i)
-		out<<i->address<<" in "<<i->symbol<<" from "<<i->file<<'\n';
+		out<<*i<<'\n';
+
+	return out;
+}
+
+ostream &operator<<(ostream &out, const Backtrace::StackFrame &sf)
+{
+	out<<sf.address;
+	if(!sf.symbol.empty())
+		out<<" in "<<sf.symbol;
+	out<<" from "<<sf.file;
 
 	return out;
 }
diff --git a/source/debug/backtrace.h b/source/debug/backtrace.h
index 9715df0..6ba3ad1 100644
--- a/source/debug/backtrace.h
+++ b/source/debug/backtrace.h
@@ -35,6 +35,7 @@ private:
 };
 
 std::ostream &operator<<(std::ostream &, const Backtrace &);
+std::ostream &operator<<(std::ostream &, const Backtrace::StackFrame &);
 
 } // namespace Debug
 } // namespace Msp
-- 
2.43.0