diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
| commit | 300b484cf6ac14c15e365c4062345d64a61c4b18 (patch) | |
| tree | f10b9abedc141192f5c35f9c0f40e94f1d52786d /libs/pbd/stacktrace.cc | |
| parent | 7d78172abfd9b02bcb6809db3f7545e90dbe968d (diff) | |
| parent | 2d5e605bf124c82f77a5a893e540bc176164947d (diff) | |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
Diffstat (limited to 'libs/pbd/stacktrace.cc')
| -rw-r--r-- | libs/pbd/stacktrace.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc index d203bef968..a51dbc934d 100644 --- a/libs/pbd/stacktrace.cc +++ b/libs/pbd/stacktrace.cc @@ -104,6 +104,12 @@ PBD::stacktrace (std::ostream& out, int levels) #else +std::string +PBD::demangle (std::string const & l) +{ + return string; +} + void PBD::stacktrace (std::ostream& out, int /*levels*/) { |