projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 d203bef968c78da1cd61e95b691302463790a64a..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 "pbd/stacktrace.h"
#include <cstdio>
#include <iostream>
+#include <string>
void
PBD::trace_twb ()
void
PBD::trace_twb ()
@@
-104,6
+105,12
@@
PBD::stacktrace (std::ostream& out, int levels)
#else
#else
+std::string
+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();
+}
+
void
PBD::stacktrace (std::ostream& out, int /*levels*/)
{
void
PBD::stacktrace (std::ostream& out, int /*levels*/)
{