diff options
author | Andreas Baumann <abaumann@yahoo.com> | 2012-09-06 10:25:57 +0200 |
---|---|---|
committer | Andreas Baumann <abaumann@yahoo.com> | 2012-09-06 10:25:57 +0200 |
commit | f5c586f7231f7e033c5528bcefea357e4e64441c (patch) | |
tree | 4d039e54c77bdb84a1cb79b56db7b62bccdd43d8 /include/logger | |
parent | a29c464aa72d46cc956ac2752a2518526c499716 (diff) | |
download | crawler-f5c586f7231f7e033c5528bcefea357e4e64441c.tar.gz crawler-f5c586f7231f7e033c5528bcefea357e4e64441c.tar.bz2 |
first properly working logger on Windows (singleton dll issue)
Diffstat (limited to 'include/logger')
-rwxr-xr-x | include/logger/ConsoleLogSink.hpp | 2 | ||||
-rwxr-xr-x | include/logger/FileLogSink.hpp | 2 | ||||
-rwxr-xr-x | include/logger/LogSink.hpp | 2 | ||||
-rwxr-xr-x | include/logger/Logger.hpp | 28 | ||||
-rwxr-xr-x | include/logger/SyslogLogSink.hpp | 2 | ||||
-rwxr-xr-x | include/logger/WinDbgLogSink.hpp | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/include/logger/ConsoleLogSink.hpp b/include/logger/ConsoleLogSink.hpp index 0605fb8..4380df8 100755 --- a/include/logger/ConsoleLogSink.hpp +++ b/include/logger/ConsoleLogSink.hpp @@ -8,7 +8,7 @@ class ConsoleLogSink : public LogSink public: ConsoleLogSink( const LogLevel level ) : LogSink( level ) { } - DLL_EXPORT virtual void log( const LogLevel level, const std::string &msg ); + DLL_VISIBLE virtual void log( const LogLevel level, const std::string &msg ); }; #endif diff --git a/include/logger/FileLogSink.hpp b/include/logger/FileLogSink.hpp index d8b1381..0acb6b9 100755 --- a/include/logger/FileLogSink.hpp +++ b/include/logger/FileLogSink.hpp @@ -13,7 +13,7 @@ class FileLogSink : public LogSink ~FileLogSink( ); - DLL_EXPORT virtual void log( const LogLevel level, const std::string &msg ); + DLL_VISIBLE virtual void log( const LogLevel level, const std::string &msg ); private: std::string m_filename; diff --git a/include/logger/LogSink.hpp b/include/logger/LogSink.hpp index 0cde9d4..4d07df0 100755 --- a/include/logger/LogSink.hpp +++ b/include/logger/LogSink.hpp @@ -11,7 +11,7 @@ class LogSink virtual ~LogSink( ) { } - DLL_EXPORT virtual void log( const LogLevel level, const std::string &msg ) = 0; + DLL_VISIBLE virtual void log( const LogLevel level, const std::string &msg ) = 0; void setReportingLevel( const LogLevel level ) { m_level = level; } diff --git a/include/logger/Logger.hpp b/include/logger/Logger.hpp index 9a84f55..f0c0012 100755 --- a/include/logger/Logger.hpp +++ b/include/logger/Logger.hpp @@ -30,21 +30,21 @@ class Logger : public Singleton< Logger > public: DECLARE_SINGLETON( Logger ) - DLL_EXPORT void addSink( LogSink *sink ); - DLL_EXPORT void removeSink( LogSink *sink ); - DLL_EXPORT void log( const LogLevel level, const std::string &msg ); + DLL_VISIBLE void addSink( LogSink *sink ); + DLL_VISIBLE void removeSink( LogSink *sink ); + DLL_VISIBLE void log( const LogLevel level, const std::string &msg ); - DLL_EXPORT static std::string toString( const LogLevel level ); - DLL_EXPORT static LogLevel fromString( const std::string &s ); + DLL_VISIBLE static std::string toString( const LogLevel level ); + DLL_VISIBLE static LogLevel fromString( const std::string &s ); - DLL_EXPORT void openConsoleLog( const LogLevel level ); - DLL_EXPORT void openFileLog( const LogLevel level, const std::string &filename ); - DLL_EXPORT void openSyslog( const LogLevel level, const std::string &ident, const std::string &facility ); - DLL_EXPORT void openWinDbgLog( const LogLevel level ); + DLL_VISIBLE void openConsoleLog( const LogLevel level ); + DLL_VISIBLE void openFileLog( const LogLevel level, const std::string &filename ); + DLL_VISIBLE void openSyslog( const LogLevel level, const std::string &ident, const std::string &facility ); + DLL_VISIBLE void openWinDbgLog( const LogLevel level ); protected: - DLL_EXPORT Logger( ); - DLL_EXPORT virtual ~Logger( ); + DLL_VISIBLE Logger( ); + DLL_VISIBLE virtual ~Logger( ); private: scopedPtr< LoggerImpl > m_impl; @@ -55,9 +55,9 @@ DEFINE_SINGLETON( Logger ) class LogStream : private noncopyable, public std::ostringstream { public: - DLL_EXPORT LogStream( Logger &logger, const LogLevel level ); - DLL_EXPORT ~LogStream( ); - DLL_EXPORT std::ostream &get( ); + DLL_VISIBLE LogStream( Logger &logger, const LogLevel level ); + DLL_VISIBLE ~LogStream( ); + DLL_VISIBLE std::ostream &get( ); private: LogStream( ); diff --git a/include/logger/SyslogLogSink.hpp b/include/logger/SyslogLogSink.hpp index af0e7ee..f5824a6 100755 --- a/include/logger/SyslogLogSink.hpp +++ b/include/logger/SyslogLogSink.hpp @@ -12,7 +12,7 @@ class SyslogLogSink : public LogSink ~SyslogLogSink( ); - DLL_EXPORT virtual void log( const LogLevel level, const std::string &msg ); + DLL_VISIBLE virtual void log( const LogLevel level, const std::string &msg ); static int levelToSyslogLevel( const LogLevel level ); static int facilityFromString( const std::string &facility ); diff --git a/include/logger/WinDbgLogSink.hpp b/include/logger/WinDbgLogSink.hpp index 67e13e7..d073cdc 100755 --- a/include/logger/WinDbgLogSink.hpp +++ b/include/logger/WinDbgLogSink.hpp @@ -8,7 +8,7 @@ class WinDbgLogSink : public LogSink public: WinDbgLogSink( const LogLevel level ) : LogSink( level ) { } - DLL_EXPORT virtual void log( const LogLevel level, const std::string &msg ); + DLL_VISIBLE virtual void log( const LogLevel level, const std::string &msg ); }; #endif |