diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2019-01-23 04:02:07 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2019-01-24 17:08:27 +0000 |
| commit | c8c7b9487b8848b24adb7ccb560bbf3671418ebd (patch) | |
| tree | aec343b1533ea19ee6e0f590f4a8d210a36f7bd3 /src/debug | |
| parent | Event: Make property value char const* too. (diff) | |
| download | inkscape-c8c7b9487b8848b24adb7ccb560bbf3671418ebd.tar.gz inkscape-c8c7b9487b8848b24adb7ccb560bbf3671418ebd.zip | |
Logger: Switch TagStack to std::shared_ptr.
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/event.h | 1 | ||||
| -rw-r--r-- | src/debug/logger.cpp | 11 | ||||
| -rw-r--r-- | src/debug/simple-event.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/debug/event.h b/src/debug/event.h index ff049d71c..db0146b4b 100644 --- a/src/debug/event.h +++ b/src/debug/event.h @@ -16,7 +16,6 @@ #include <memory> #include <string> #include <utility> -#include "util/share.h" namespace Inkscape { diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp index 7c0990c2c..2c76921ac 100644 --- a/src/debug/logger.cpp +++ b/src/debug/logger.cpp @@ -11,12 +11,13 @@ */ #include <fstream> +#include <memory> +#include <string> #include <vector> #include <glib.h> #include "inkscape-version.h" #include "debug/logger.h" #include "debug/simple-event.h" -#include "inkgc/gc-alloc.h" namespace Inkscape { @@ -59,7 +60,7 @@ static void write_indent(std::ostream &os, unsigned depth) { static std::ofstream log_stream; static bool empty_tag=false; -typedef std::vector<Util::ptr_shared, GC::Alloc<Util::ptr_shared, GC::MANUAL> > TagStack; +typedef std::vector<std::shared_ptr<std::string>> TagStack; static TagStack &tag_stack() { static TagStack stack; return stack; @@ -179,14 +180,14 @@ void Logger::_start(Event const &event) { log_stream.flush(); - tag_stack().push_back(Util::share_string(name)); + tag_stack().push_back(std::make_shared<std::string>(name)); empty_tag = true; event.generateChildEvents(); } void Logger::_skip() { - tag_stack().push_back(Util::ptr_shared()); + tag_stack().push_back(nullptr); } void Logger::_finish() { @@ -195,7 +196,7 @@ void Logger::_finish() { log_stream << "/>\n"; } else { write_indent(log_stream, tag_stack().size() - 1); - log_stream << "</" << tag_stack().back().pointer() << ">\n"; + log_stream << "</" << tag_stack().back()->c_str() << ">\n"; } log_stream.flush(); diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h index 1b6dc172c..96dde6893 100644 --- a/src/debug/simple-event.h +++ b/src/debug/simple-event.h @@ -19,8 +19,8 @@ #include <vector> #include <glib.h> // g_assert() -#include "inkgc/gc-alloc.h" #include "debug/event.h" +#include "util/share.h" namespace Inkscape { |