From 9e8e96c9e98e4aed3713ca09011aebafc9f62f87 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 25 May 2007 17:32:16 +0000
Subject: [PATCH] Make this thing actually compile

---
 Build                     | 7 +++++++
 source/core/error.cpp     | 3 +--
 source/core/error.h       | 6 +++---
 source/debug/demangle.cpp | 2 ++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Build b/Build
index d172391..b7d5d5b 100644
--- a/Build
+++ b/Build
@@ -14,6 +14,7 @@ package "mspcore"
 	library "mspcore"
 	{
 		source "source/core";
+		source "source/debug";
 		source "source/time";
 		install true;
 	};
@@ -29,4 +30,10 @@ package "mspcore"
 		source "source/time";
 		install_headers "msp/time";
 	};
+
+	headers "debug"
+	{
+		source "source/debug";
+		install_headers "msp/debug";
+	};
 };
diff --git a/source/core/error.cpp b/source/core/error.cpp
index 727fa21..defed2f 100644
--- a/source/core/error.cpp
+++ b/source/core/error.cpp
@@ -5,7 +5,6 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 #include <sstream>
-#include "backtrace.h"
 #include "error.h"
 
 using namespace std;
@@ -16,7 +15,7 @@ Exception::Exception(const string &w_):
 	w(w_)
 {
 #ifdef WITH_EXCEPTION_BACKTRACE
-	bt=Backtrace::create();
+	bt=Debug::Backtrace::create();
 #endif
 }
 
diff --git a/source/core/error.h b/source/core/error.h
index 1f9662e..eecda49 100644
--- a/source/core/error.h
+++ b/source/core/error.h
@@ -9,7 +9,7 @@ Distributed under the LGPL
 
 #include <exception>
 #include <string>
-#include "backtrace.h"
+#include "../debug/backtrace.h"
 
 namespace Msp {
 
@@ -23,10 +23,10 @@ public:
 	~Exception() throw() { }
 
 	const char *what() const throw() { return w.c_str(); }
-	const Backtrace &get_backtrace() const throw() { return bt; }
+	const Debug::Backtrace &get_backtrace() const throw() { return bt; }
 private:
 	std::string w;
-	Backtrace bt;
+	Debug::Backtrace bt;
 
 };
 
diff --git a/source/debug/demangle.cpp b/source/debug/demangle.cpp
index 58e05ce..bb59bd7 100644
--- a/source/debug/demangle.cpp
+++ b/source/debug/demangle.cpp
@@ -44,6 +44,8 @@ string demangle_gcc3(const string &sym)
 		bool ref=(*i=='R');
 		if(ref) ++i;
 	}
+
+	return result;
 }
 
 } // namespace Debug
-- 
2.45.2