From f83677056891e436bf5ba99e79240df2a44528cd Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 21 Oct 2011 14:42:12 +0000 Subject: Merged out from trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/include/qpid/log/Logger.h | 6 +++--- cpp/include/qpid/log/Options.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cpp/include/qpid/log') diff --git a/cpp/include/qpid/log/Logger.h b/cpp/include/qpid/log/Logger.h index 783ab7bdb9..d255b7e150 100644 --- a/cpp/include/qpid/log/Logger.h +++ b/cpp/include/qpid/log/Logger.h @@ -33,10 +33,10 @@ namespace log { * is handled by Logger::Output-derived classes instantiated by the * platform's sink-related options. */ -class Logger : private boost::noncopyable { +class QPID_COMMON_CLASS_EXTERN Logger : private boost::noncopyable { public: /** Flags indicating what to include in the log output */ - enum FormatFlag { FILE=1, LINE=2, FUNCTION=4, LEVEL=8, TIME=16, THREAD=32}; + enum FormatFlag { FILE=1, LINE=2, FUNCTION=4, LEVEL=8, TIME=16, THREAD=32, HIRES=64}; /** * Logging output sink. @@ -93,7 +93,7 @@ class Logger : private boost::noncopyable { QPID_COMMON_EXTERN void clear(); /** Get the options used to configure the logger. */ - QPID_COMMON_EXTERN const Options& getOptions() const { return options; } + QPID_COMMON_INLINE_EXTERN const Options& getOptions() const { return options; } private: diff --git a/cpp/include/qpid/log/Options.h b/cpp/include/qpid/log/Options.h index bbc47b47d3..17cbfde9bc 100644 --- a/cpp/include/qpid/log/Options.h +++ b/cpp/include/qpid/log/Options.h @@ -39,7 +39,7 @@ struct Options : public qpid::Options { std::string argv0; std::string name; std::vector selectors; - bool time, level, thread, source, function; + bool time, level, thread, source, function, hiresTs; bool trace; std::string prefix; std::auto_ptr sinkOptions; -- cgit v1.2.1