Make this thing actually compile

diff --git a/Build b/Build
index d172391103c3d5d57894284d7083105aa5fa5de1..b7d5d5b717a2155036d4301e27a8a01b41effaac 100644 (file)
--- 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 727fa215adf3989b9f37c52f7fecae8c9f577f34..defed2f599d2ca879895c91b03031a8a829cd94e 100644 (file)
--- 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 1f9662e274b1d9b087d9cb16e5c1cf30f8c6811b..eecda49bd00cf8553a6f1be02c7c739a1e07e667 100644 (file)
--- 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 58e05cefd58e687fb22928ea02c6fc602a1bca2e..bb59bd72f1d1acabd2b9e69c45050dcd9a3f0d72 100644 (file)
--- 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