merge with master, with minor conflict fixes

[ardour.git] / libs / pbd / stacktrace.cc

diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index 0177b8c9e8e6f36fc1558ba2efef47084018261b..c74dd946f78d7896246d4dfe36f19df64440bc32 100644 (file)
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -22,6 +22,7 @@
 #include "pbd/stacktrace.h"
 #include <cstdio>
 #include <iostream>
+#include <string>
 
 void
 PBD::trace_twb ()
@@ -105,7 +106,7 @@ PBD::stacktrace (std::ostream& out, int levels)
 #else
 
 std::string 
-PBD::demangle (std::string const & l)
+PBD::demangle (std::string const & l) /* JE - !!!! 'PBD' namespace might possibly get removed (except it's still used in 'libs/canvas/item.cc') */
 {
        return std::string();
 }