diff --git a/src/log4cpp.hpp b/src/log4cpp.hpp index 894e921..0123249 100644 --- a/src/log4cpp.hpp +++ b/src/log4cpp.hpp @@ -18,13 +18,13 @@ void __slog(const char* func, const char* file, int line, std::stringstream& ss) void _dlog(const char* func, const char* file, int line, const char* fmt, ...); #if DEBUG - #define _slog(ss) __slog(__FUNCTION__, __FILE__, __LINE__, (std::stringstream&)(ss)); - #define dlog(fmt, ...) _dlog(__FUNCTION__, __FILE__, __LINE__, fmt, __VA_ARGS__); + #define _slog(ss) __slog(__func__, __FILE__, __LINE__, (std::stringstream&)(ss)); + #define dlog(fmt, ...) _dlog(__func__, __FILE__, __LINE__, fmt, __VA_ARGS__); #else #define _slog(ss) #define dlog(fmt, ...) #endif -#define sclog(fmt, ...) _dlog(__FUNCTION__, __FILE__, __LINE__, fmt, __VA_ARGS__); +#define sclog(fmt, ...) _dlog(__func__, __FILE__, __LINE__, fmt, __VA_ARGS__); #endif //__log4cpp__ diff --git a/src/logger.hpp b/src/logger.hpp index 079ef35..8eb18ac 100644 --- a/src/logger.hpp +++ b/src/logger.hpp @@ -66,10 +66,10 @@ namespace sc { } -#define SCDebug(logger, ...) logger.msg(sc::loglevel::debug, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) -#define SCInfo(logger, ...) logger.msg(sc::loglevel::info, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) -#define SCWarning(logger, ...) logger.msg(sc::loglevel::warning, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) -#define SCError(logger, ...) logger.msg(sc::loglevel::error, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) -#define SCCritical(logger, ...) logger.msg(sc::loglevel::critical, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) +#define SCDebug(logger, ...) logger.msg(sc::loglevel::debug, __FILE__, __LINE__, __func__, __VA_ARGS__) +#define SCInfo(logger, ...) logger.msg(sc::loglevel::info, __FILE__, __LINE__, __func__, __VA_ARGS__) +#define SCWarning(logger, ...) logger.msg(sc::loglevel::warning, __FILE__, __LINE__, __func__, __VA_ARGS__) +#define SCError(logger, ...) logger.msg(sc::loglevel::error, __FILE__, __LINE__, __func__, __VA_ARGS__) +#define SCCritical(logger, ...) logger.msg(sc::loglevel::critical, __FILE__, __LINE__, __func__, __VA_ARGS__) #endif // _logger_H_