diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2008-04-04 21:59:29 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2008-04-04 21:59:29 +0000 |
| commit | 3661f3624acc46590d5504fda4f8714255fb2c8e (patch) | |
| tree | e2cd17e19718d3f46944979a23e4c93dcf92584b /lib/common/Logging.h | |
| parent | 2f8d0c29536cdb306b525b78638727da4ead0022 (diff) | |
Tailorization
Import of the upstream sources from
Repository: http://localhost:8000/
Kind: hg
Revision: 7807b7768163f1c2537756abe5416063989cebb1
Original author: tailor@rocio.int.aidworld.org
Date: 2008-03-16 19:44:36+00:00
Diffstat (limited to 'lib/common/Logging.h')
| -rw-r--r-- | lib/common/Logging.h | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/lib/common/Logging.h b/lib/common/Logging.h index 2c967c89..2d726627 100644 --- a/lib/common/Logging.h +++ b/lib/common/Logging.h @@ -27,16 +27,16 @@ #define BOX_LOG(level, stuff) \ { \ - std::ostringstream _box_log_line; \ - _box_log_line << stuff; \ - Logging::Log(level, __FILE__, __LINE__, _box_log_line.str()); \ + std::ostringstream line; \ + line << stuff; \ + Logging::Log(level, __FILE__, __LINE__, line.str()); \ } #define BOX_SYSLOG(level, stuff) \ { \ - std::ostringstream _box_log_line; \ - _box_log_line << stuff; \ - Logging::LogToSyslog(level, __FILE__, __LINE__, _box_log_line.str()); \ + std::ostringstream line; \ + line << stuff; \ + Logging::LogToSyslog(level, __FILE__, __LINE__, line.str()); \ } #define BOX_FATAL(stuff) BOX_LOG(Log::FATAL, stuff) @@ -48,32 +48,15 @@ if (Logging::IsEnabled(Log::TRACE)) \ { BOX_LOG(Log::TRACE, stuff) } -#define BOX_LOG_SYS_WARNING(stuff) \ - BOX_WARNING(stuff << ": " << strerror(errno) << " (" << errno << ")") -#define BOX_LOG_SYS_ERROR(stuff) \ - BOX_ERROR(stuff << ": " << strerror(errno) << " (" << errno << ")") -#define BOX_LOG_SYS_FATAL(stuff) \ - BOX_FATAL(stuff << ": " << strerror(errno) << " (" << errno << ")") - -#ifdef WIN32 - #define BOX_LOG_WIN_ERROR(stuff) \ - BOX_ERROR(stuff << ": " << GetErrorMessage(GetLastError())) - #define BOX_LOG_WIN_ERROR_NUMBER(stuff, number) \ - BOX_ERROR(stuff << ": " << GetErrorMessage(number)) -#endif - -#define BOX_FORMAT_HEX32(number) \ +#define BOX_FORMAT_ACCOUNT(accno) \ std::hex << \ std::showbase << \ std::internal << \ std::setw(10) << \ std::setfill('0') << \ - (number) << \ + (accno) << \ std::dec -#define BOX_FORMAT_ACCOUNT(accno) \ - BOX_FORMAT_HEX32(accno) - #define BOX_FORMAT_OBJECTID(objectid) \ std::hex << \ std::showbase << \ |