From fc9e01c68ad7166375e5808e625cd79fe2980272 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 2 Jun 2010 23:45:51 +0000 Subject: [PATCH] * Forward declare the LogSink global * Change GetSink() to return a const pointer. Originally committed to SVN as r4405. --- aegisub/libaegisub/include/libaegisub/log.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/aegisub/libaegisub/include/libaegisub/log.h b/aegisub/libaegisub/include/libaegisub/log.h index 074650603..1fc66fb39 100644 --- a/aegisub/libaegisub/include/libaegisub/log.h +++ b/aegisub/libaegisub/include/libaegisub/log.h @@ -47,6 +47,7 @@ namespace agi { namespace log { +class LogSink; /// Severity levels enum Severity { @@ -61,6 +62,8 @@ enum Severity { /// Set in common/log.cpp, keep this ordered the same as Severity. extern const char *Severity_ID; +/// Global log sink. +extern LogSink *log; /// Container to hold a single message struct SinkMessage { @@ -126,11 +129,10 @@ public: void Unsubscribe(const int &id); /// @brief @get the complete (current) log. - /// @param[out] out Reference to a sink. - void GetSink(Sink *s); + /// @return Const pointer to internal sink. + const Sink* GetSink() { return sink; } }; - /// An emitter to produce human readable output for a log sink. class Emitter { /// ID for this emitter