diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2019-01-23 04:28:54 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2019-01-24 17:08:27 +0000 |
| commit | 7dd1ed2d4eb8f7042587d22c601e3b3ad40cdcc2 (patch) | |
| tree | c936faa4f4f17374eacd937b926f7d474900bf7d /src/debug | |
| parent | Event: Switch all call sites from Util::ptr_shared to char const* or std::sha... (diff) | |
| download | inkscape-7dd1ed2d4eb8f7042587d22c601e3b3ad40cdcc2.tar.gz inkscape-7dd1ed2d4eb8f7042587d22c601e3b3ad40cdcc2.zip | |
Demangle: Switch to std::shared_ptr.
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/demangle.cpp | 17 | ||||
| -rw-r--r-- | src/debug/demangle.h | 5 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/debug/demangle.cpp b/src/debug/demangle.cpp index 28b5d26d4..60e1f176d 100644 --- a/src/debug/demangle.cpp +++ b/src/debug/demangle.cpp @@ -13,9 +13,10 @@ #include <cstdio> #include <cstring> #include <map> +#include <memory> +#include <string> #include "debug/demangle.h" #include "util/format.h" -#include "inkgc/gc-alloc.h" namespace Inkscape { @@ -46,23 +47,19 @@ struct string_less_than { } }; -typedef std::map<char const *, char const *, string_less_than> MangleCache; +typedef std::map<char const *, std::shared_ptr<std::string>, string_less_than> MangleCache; MangleCache mangle_cache; } -Util::ptr_shared demangle(char const *name) { +std::shared_ptr<std::string> demangle(char const *name) { MangleCache::iterator found=mangle_cache.find(name); - - char const *result; if ( found != mangle_cache.end() ) { - result = (*found).second; - } else { - result = demangle_helper(name); - mangle_cache[name] = result; + return (*found).second; } - return Util::share_unsafe(result); + char const *result = demangle_helper(name); + return mangle_cache[name] = std::make_shared<std::string>(result); } } diff --git a/src/debug/demangle.h b/src/debug/demangle.h index 95042446f..ba747cd3a 100644 --- a/src/debug/demangle.h +++ b/src/debug/demangle.h @@ -13,13 +13,14 @@ #ifndef SEEN_INKSCAPE_DEBUG_DEMANGLE_H #define SEEN_INKSCAPE_DEBUG_DEMANGLE_H -#include "util/share.h" +#include <memory> +#include <string> namespace Inkscape { namespace Debug { -Util::ptr_shared demangle(char const *name); +std::shared_ptr<std::string> demangle(char const *name); } |