diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp
index a3c7b0430074b471593e3d658f927a5fcd9cce77..6fb1aee05e685bb661b590e29acf26c25be4eff5 100644 (file)
--- a/src/debug/logger.cpp
+++ b/src/debug/logger.cpp
namespace {
-static void write_escaped_value(std::ostream &os, Util::SharedCStringPtr value) {
+static void write_escaped_value(std::ostream &os, Util::shared_ptr<char> value) {
for ( char const *current=value ; *current ; ++current ) {
switch (*current) {
case '&':
static std::ofstream log_stream;
static bool empty_tag=false;
-typedef std::vector<Util::SharedCStringPtr, GC::Alloc<Util::SharedCStringPtr, GC::MANUAL> > TagStack;
+typedef std::vector<Util::shared_ptr<char>, GC::Alloc<Util::shared_ptr<char>, GC::MANUAL> > TagStack;
static TagStack &tag_stack() {
static TagStack stack;
return stack;
log_stream << "<?xml version=\"1.0\"?>\n";
log_stream.flush();
_enabled = true;
- start<SimpleEvent<Event::CORE> >(Util::SharedCStringPtr::coerce("session"));
+ start<SimpleEvent<Event::CORE> >(Util::share_static("session"));
std::atexit(&do_shutdown);
}
}
}
void Logger::_start(Event const &event) {
- Util::SharedCStringPtr name=event.name();
+ Util::shared_ptr<char> name=event.name();
if (empty_tag) {
log_stream << ">\n";
write_indent(log_stream, tag_stack().size());
- log_stream << "<" << name.cString();
+ log_stream << "<" << name.pointer();
unsigned property_count=event.propertyCount();
for ( unsigned i = 0 ; i < property_count ; i++ ) {
Event::PropertyPair property=event.property(i);
- log_stream << " " << property.name.cString() << "=\"";
+ log_stream << " " << property.name.pointer() << "=\"";
write_escaped_value(log_stream, property.value);
log_stream << "\"";
}
}
void Logger::_skip() {
- tag_stack().push_back(Util::SharedCStringPtr());
+ tag_stack().push_back(Util::shared_ptr<char>());
}
void Logger::_finish() {
log_stream << "/>\n";
} else {
write_indent(log_stream, tag_stack().size() - 1);
- log_stream << "</" << tag_stack().back().cString() << ">\n";
+ log_stream << "</" << tag_stack().back().pointer() << ">\n";
}
log_stream.flush();