diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-15 17:38:08 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-15 17:38:08 +0100 |
| commit | 97c68cc2b1f302521244e139a8a49019702038e7 (patch) | |
| tree | 04171941f47a9d9bf3d8a92260e2a1af2752c71c /libs/pbd/stacktrace.cc | |
| parent | e466ce40ad1ba591543020cb7c0aa15dbebef81e (diff) | |
| parent | 8ea695c00ab0bdbc6fbb29b33fac6e3dbfcbe9f1 (diff) | |
Merge branch 'windows' into windows+cc
Conflicts (hopefully resolved):
libs/pbd/stacktrace.cc
Diffstat (limited to 'libs/pbd/stacktrace.cc')
| -rw-r--r-- | libs/pbd/stacktrace.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc index eca808bfd7..aa79b0f24d 100644 --- a/libs/pbd/stacktrace.cc +++ b/libs/pbd/stacktrace.cc @@ -106,10 +106,9 @@ PBD::stacktrace (std::ostream& out, int levels) #else std::string -PBD::demangle (std::string const & l) +demangle (std::string const & l) { - std::string empty_string; - return empty_string; + return std::string(); } void |