diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 16:07:57 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 16:07:57 -0500 |
| commit | 3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2 (patch) | |
| tree | 314c3099bcc57d9af09d249e1e7dd8e45baca642 /libs/pbd/stacktrace.cc | |
| parent | d15fda6d751a465d278f477923075d4783f3b1ca (diff) | |
| parent | 897fbdc652434d3aa1e67223c3c3ef7ae9be2318 (diff) | |
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
Diffstat (limited to 'libs/pbd/stacktrace.cc')
| -rw-r--r-- | libs/pbd/stacktrace.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc index 0177b8c9e8..c74dd946f7 100644 --- 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(); } |