diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
| commit | e5888d398350b26ba2cdc634cc9791e90b4fc6b6 (patch) | |
| tree | 54f485ea56d034ecba01938fbc680b12884fc136 /libs/pbd/stacktrace.cc | |
| parent | 18850253e9f0034fad132e0da07a2651ce041450 (diff) | |
| parent | da5a49067839ec32a016bf1b66c3808ad7cbf699 (diff) | |
merge with master and fix 2 conflicts
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..e45aec22bc 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 +demangle (std::string const & l) +{ + return std::string(); +} + void PBD::stacktrace (std::ostream& out, int /*levels*/) { |