From fd442f100e0737b256b9e8122a4704948c77185a Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 25 Mar 2016 10:04:42 +0100 Subject: [PATCH] Remove unused code. Extends Logger::testFormatAny up to 15 args. Signed-off-by: FrancisANDRE --- Foundation/include/Poco/Format.h | 10 + Foundation/include/Poco/Logger.h | 611 ++++++------------------ Foundation/src/Format.cpp | 142 +++++- Foundation/testsuite/src/LoggerTest.cpp | 15 + 4 files changed, 316 insertions(+), 462 deletions(-) diff --git a/Foundation/include/Poco/Format.h b/Foundation/include/Poco/Format.h index 1b43e9744..42794dfd7 100644 --- a/Foundation/include/Poco/Format.h +++ b/Foundation/include/Poco/Format.h @@ -113,6 +113,11 @@ std::string Foundation_API format(const std::string& fmt, const Any& value1, con std::string Foundation_API format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); std::string Foundation_API format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); std::string Foundation_API format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); +std::string Foundation_API format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); +std::string Foundation_API format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); +std::string Foundation_API format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); +std::string Foundation_API format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); +std::string Foundation_API format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void Foundation_API format(std::string& result, const std::string& fmt, const Any& value); @@ -127,6 +132,11 @@ void Foundation_API format(std::string& result, const std::string& fmt, const An void Foundation_API format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); void Foundation_API format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); void Foundation_API format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); +void Foundation_API format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); +void Foundation_API format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); +void Foundation_API format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); +void Foundation_API format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); +void Foundation_API format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void Foundation_API format(std::string& result, const std::string& fmt, const std::vector& values); diff --git a/Foundation/include/Poco/Logger.h b/Foundation/include/Poco/Logger.h index 9f5f60c86..e05281157 100644 --- a/Foundation/include/Poco/Logger.h +++ b/Foundation/include/Poco/Logger.h @@ -162,6 +162,11 @@ public: void fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); void fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); void fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); + void fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); + void fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); + void fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); + void fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); + void fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void critical(const std::string& msg); /// If the Logger's log level is at least PRIO_CRITICAL, @@ -189,6 +194,11 @@ public: void critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); void critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); void critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); + void critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); + void critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); + void critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); + void critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); + void critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void error(const std::string& msg); /// If the Logger's log level is at least PRIO_ERROR, @@ -216,6 +226,11 @@ public: void error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); void error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); void error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); + void error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); + void error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); + void error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); + void error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); + void error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void warning(const std::string& msg); /// If the Logger's log level is at least PRIO_WARNING, @@ -243,6 +258,11 @@ public: void warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); void warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); void warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); + void warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); + void warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); + void warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); + void warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); + void warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void notice(const std::string& msg); /// If the Logger's log level is at least PRIO_NOTICE, @@ -270,6 +290,11 @@ public: void notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); void notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); void notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); + void notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); + void notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); + void notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); + void notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); + void notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void information(const std::string& msg); /// If the Logger's log level is at least PRIO_INFORMATION, @@ -297,6 +322,11 @@ public: void information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); void information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); void information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); + void information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); + void information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); + void information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); + void information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); + void information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void debug(const std::string& msg); /// If the Logger's log level is at least PRIO_DEBUG, @@ -324,6 +354,11 @@ public: void debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); void debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); void debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); + void debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); + void debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); + void debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); + void debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); + void debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void trace(const std::string& msg); /// If the Logger's log level is at least PRIO_TRACE, @@ -351,6 +386,11 @@ public: void trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8); void trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9); void trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10); + void trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11); + void trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12); + void trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13); + void trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14); + void trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15); void dump(const std::string& msg, const void* buffer, std::size_t length, Message::Priority prio = Message::PRIO_DEBUG); /// Logs the given message, followed by the data in buffer. @@ -695,67 +735,6 @@ inline void Logger::fatal(const std::string& msg, const char* file, int line) log(msg, Message::PRIO_FATAL, file, line); } - -inline void Logger::fatal(const std::string& fmt, const Any& value1) -{ - log(Poco::format(fmt, value1), Message::PRIO_FATAL); -} - - -inline void Logger::fatal(const std::string& fmt, const Any& value1, const Any& value2) -{ - log(Poco::format(fmt, value1, value2), Message::PRIO_FATAL); -} - - -inline void Logger::fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3) -{ - log(Poco::format(fmt, value1, value2, value3), Message::PRIO_FATAL); -} - - -inline void Logger::fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4) -{ - log(Poco::format(fmt, value1, value2, value3, value4), Message::PRIO_FATAL); -} - - -inline void Logger::fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5), Message::PRIO_FATAL); -} - - -inline void Logger::fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6), Message::PRIO_FATAL); -} - - -inline void Logger::fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7), Message::PRIO_FATAL); -} - - -inline void Logger::fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8), Message::PRIO_FATAL); -} - - -inline void Logger::fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9), Message::PRIO_FATAL); -} - - -inline void Logger::fatal(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10), Message::PRIO_FATAL); -} - - inline void Logger::critical(const std::string& msg) { log(msg, Message::PRIO_CRITICAL); @@ -768,66 +747,6 @@ inline void Logger::critical(const std::string& msg, const char* file, int line) } -inline void Logger::critical(const std::string& fmt, const Any& value1) -{ - log(Poco::format(fmt, value1), Message::PRIO_CRITICAL); -} - - -inline void Logger::critical(const std::string& fmt, const Any& value1, const Any& value2) -{ - log(Poco::format(fmt, value1, value2), Message::PRIO_CRITICAL); -} - - -inline void Logger::critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3) -{ - log(Poco::format(fmt, value1, value2, value3), Message::PRIO_CRITICAL); -} - - -inline void Logger::critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4) -{ - log(Poco::format(fmt, value1, value2, value3, value4), Message::PRIO_CRITICAL); -} - - -inline void Logger::critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5), Message::PRIO_CRITICAL); -} - - -inline void Logger::critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6), Message::PRIO_CRITICAL); -} - - -inline void Logger::critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7), Message::PRIO_CRITICAL); -} - - -inline void Logger::critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8), Message::PRIO_CRITICAL); -} - - -inline void Logger::critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9), Message::PRIO_CRITICAL); -} - - -inline void Logger::critical(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10), Message::PRIO_CRITICAL); -} - - inline void Logger::error(const std::string& msg) { log(msg, Message::PRIO_ERROR); @@ -839,67 +758,6 @@ inline void Logger::error(const std::string& msg, const char* file, int line) log(msg, Message::PRIO_ERROR, file, line); } - -inline void Logger::error(const std::string& fmt, const Any& value1) -{ - log(Poco::format(fmt, value1), Message::PRIO_ERROR); -} - - -inline void Logger::error(const std::string& fmt, const Any& value1, const Any& value2) -{ - log(Poco::format(fmt, value1, value2), Message::PRIO_ERROR); -} - - -inline void Logger::error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3) -{ - log(Poco::format(fmt, value1, value2, value3), Message::PRIO_ERROR); -} - - -inline void Logger::error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4) -{ - log(Poco::format(fmt, value1, value2, value3, value4), Message::PRIO_ERROR); -} - - -inline void Logger::error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5), Message::PRIO_ERROR); -} - - -inline void Logger::error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6), Message::PRIO_ERROR); -} - - -inline void Logger::error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7), Message::PRIO_ERROR); -} - - -inline void Logger::error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8), Message::PRIO_ERROR); -} - - -inline void Logger::error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9), Message::PRIO_ERROR); -} - - -inline void Logger::error(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10), Message::PRIO_ERROR); -} - - inline void Logger::warning(const std::string& msg) { log(msg, Message::PRIO_WARNING); @@ -912,66 +770,6 @@ inline void Logger::warning(const std::string& msg, const char* file, int line) } -inline void Logger::warning(const std::string& fmt, const Any& value1) -{ - log(Poco::format(fmt, value1), Message::PRIO_WARNING); -} - - -inline void Logger::warning(const std::string& fmt, const Any& value1, const Any& value2) -{ - log(Poco::format(fmt, value1, value2), Message::PRIO_WARNING); -} - - -inline void Logger::warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3) -{ - log(Poco::format(fmt, value1, value2, value3), Message::PRIO_WARNING); -} - - -inline void Logger::warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4) -{ - log(Poco::format(fmt, value1, value2, value3, value4), Message::PRIO_WARNING); -} - - -inline void Logger::warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5), Message::PRIO_WARNING); -} - - -inline void Logger::warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6), Message::PRIO_WARNING); -} - - -inline void Logger::warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7), Message::PRIO_WARNING); -} - - -inline void Logger::warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8), Message::PRIO_WARNING); -} - - -inline void Logger::warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9), Message::PRIO_WARNING); -} - - -inline void Logger::warning(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10), Message::PRIO_WARNING); -} - - inline void Logger::notice(const std::string& msg) { log(msg, Message::PRIO_NOTICE); @@ -984,66 +782,6 @@ inline void Logger::notice(const std::string& msg, const char* file, int line) } -inline void Logger::notice(const std::string& fmt, const Any& value1) -{ - log(Poco::format(fmt, value1), Message::PRIO_NOTICE); -} - - -inline void Logger::notice(const std::string& fmt, const Any& value1, const Any& value2) -{ - log(Poco::format(fmt, value1, value2), Message::PRIO_NOTICE); -} - - -inline void Logger::notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3) -{ - log(Poco::format(fmt, value1, value2, value3), Message::PRIO_NOTICE); -} - - -inline void Logger::notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4) -{ - log(Poco::format(fmt, value1, value2, value3, value4), Message::PRIO_NOTICE); -} - - -inline void Logger::notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5), Message::PRIO_NOTICE); -} - - -inline void Logger::notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6), Message::PRIO_NOTICE); -} - - -inline void Logger::notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7), Message::PRIO_NOTICE); -} - - -inline void Logger::notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8), Message::PRIO_NOTICE); -} - - -inline void Logger::notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9), Message::PRIO_NOTICE); -} - - -inline void Logger::notice(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10), Message::PRIO_NOTICE); -} - - inline void Logger::information(const std::string& msg) { log(msg, Message::PRIO_INFORMATION); @@ -1056,66 +794,6 @@ inline void Logger::information(const std::string& msg, const char* file, int li } -inline void Logger::information(const std::string& fmt, const Any& value1) -{ - log(Poco::format(fmt, value1), Message::PRIO_INFORMATION); -} - - -inline void Logger::information(const std::string& fmt, const Any& value1, const Any& value2) -{ - log(Poco::format(fmt, value1, value2), Message::PRIO_INFORMATION); -} - - -inline void Logger::information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3) -{ - log(Poco::format(fmt, value1, value2, value3), Message::PRIO_INFORMATION); -} - - -inline void Logger::information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4) -{ - log(Poco::format(fmt, value1, value2, value3, value4), Message::PRIO_INFORMATION); -} - - -inline void Logger::information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5), Message::PRIO_INFORMATION); -} - - -inline void Logger::information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6), Message::PRIO_INFORMATION); -} - - -inline void Logger::information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7), Message::PRIO_INFORMATION); -} - - -inline void Logger::information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8), Message::PRIO_INFORMATION); -} - - -inline void Logger::information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9), Message::PRIO_INFORMATION); -} - - -inline void Logger::information(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10), Message::PRIO_INFORMATION); -} - - inline void Logger::debug(const std::string& msg) { log(msg, Message::PRIO_DEBUG); @@ -1128,66 +806,6 @@ inline void Logger::debug(const std::string& msg, const char* file, int line) } -inline void Logger::debug(const std::string& fmt, const Any& value1) -{ - log(Poco::format(fmt, value1), Message::PRIO_DEBUG); -} - - -inline void Logger::debug(const std::string& fmt, const Any& value1, const Any& value2) -{ - log(Poco::format(fmt, value1, value2), Message::PRIO_DEBUG); -} - - -inline void Logger::debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3) -{ - log(Poco::format(fmt, value1, value2, value3), Message::PRIO_DEBUG); -} - - -inline void Logger::debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4) -{ - log(Poco::format(fmt, value1, value2, value3, value4), Message::PRIO_DEBUG); -} - - -inline void Logger::debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5), Message::PRIO_DEBUG); -} - - -inline void Logger::debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6), Message::PRIO_DEBUG); -} - - -inline void Logger::debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7), Message::PRIO_DEBUG); -} - - -inline void Logger::debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8), Message::PRIO_DEBUG); -} - - -inline void Logger::debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9), Message::PRIO_DEBUG); -} - - -inline void Logger::debug(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10), Message::PRIO_DEBUG); -} - - inline void Logger::trace(const std::string& msg) { log(msg, Message::PRIO_TRACE); @@ -1200,65 +818,136 @@ inline void Logger::trace(const std::string& msg, const char* file, int line) } -inline void Logger::trace(const std::string& fmt, const Any& value1) -{ - log(Poco::format(fmt, value1), Message::PRIO_TRACE); +#define INLINE01(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1) \ +{ \ + log(Poco::format(fmt, value1), Message::PRIORITY); \ +} +#define INLINE02(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2) \ +{ \ + log(Poco::format(fmt, value1, value2), Message::PRIORITY); \ +} +#define INLINE03(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3) \ +{ \ + log(Poco::format(fmt, value1, value2, value3), Message::PRIORITY); \ } - -inline void Logger::trace(const std::string& fmt, const Any& value1, const Any& value2) -{ - log(Poco::format(fmt, value1, value2), Message::PRIO_TRACE); +#define INLINE04(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4), Message::PRIORITY); \ } - -inline void Logger::trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3) -{ - log(Poco::format(fmt, value1, value2, value3), Message::PRIO_TRACE); +#define INLINE05(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5), Message::PRIORITY); \ } - -inline void Logger::trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4) -{ - log(Poco::format(fmt, value1, value2, value3, value4), Message::PRIO_TRACE); +#define INLINE06(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6), Message::PRIORITY); \ } - -inline void Logger::trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5), Message::PRIO_TRACE); +#define INLINE07(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7), Message::PRIORITY); \ } - -inline void Logger::trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6), Message::PRIO_TRACE); +#define INLINE08(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8), Message::PRIORITY); \ } - -inline void Logger::trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7), Message::PRIO_TRACE); +#define INLINE09(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9), Message::PRIORITY); \ } - -inline void Logger::trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8), Message::PRIO_TRACE); +#define INLINE10(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10), Message::PRIORITY); \ } - -inline void Logger::trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9), Message::PRIO_TRACE); +#define INLINE11(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11), Message::PRIORITY); \ } - -inline void Logger::trace(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10) -{ - log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10), Message::PRIO_TRACE); +#define INLINE12(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12), Message::PRIORITY); \ } +#define INLINE13(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13), Message::PRIORITY); \ +} + +#define INLINE14(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14), Message::PRIORITY); \ +} + +#define INLINE15(name, PRIORITY) \ +inline void Logger::name(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15) \ +{ \ + log(Poco::format(fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15), Message::PRIORITY); \ +} + +#define INLINES(name, PRIORITY) \ +INLINE01(name, PRIORITY) \ +INLINE02(name, PRIORITY) \ +INLINE03(name, PRIORITY) \ +INLINE04(name, PRIORITY) \ +INLINE05(name, PRIORITY) \ +INLINE06(name, PRIORITY) \ +INLINE07(name, PRIORITY) \ +INLINE08(name, PRIORITY) \ +INLINE09(name, PRIORITY) \ +INLINE10(name, PRIORITY) \ +INLINE11(name, PRIORITY) \ +INLINE12(name, PRIORITY) \ +INLINE13(name, PRIORITY) \ +INLINE14(name, PRIORITY) \ +INLINE15(name, PRIORITY) + +INLINES(fatal, PRIO_FATAL) +INLINES(critical, PRIO_CRITICAL) +INLINES(error, PRIO_ERROR) +INLINES(warning, PRIO_WARNING) +INLINES(notice, PRIO_NOTICE) +INLINES(information,PRIO_INFORMATION) +INLINES(debug, PRIO_DEBUG) +INLINES(trace, PRIO_TRACE) + +#undef INLINE01 +#undef INLINE02 +#undef INLINE03 +#undef INLINE04 +#undef INLINE05 +#undef INLINE06 +#undef INLINE07 +#undef INLINE08 +#undef INLINE09 +#undef INLINE10 +#undef INLINE11 +#undef INLINE12 +#undef INLINE13 +#undef INLINE14 +#undef INLINE15 +#undef INLINES inline bool Logger::is(int level) const { diff --git a/Foundation/src/Format.cpp b/Foundation/src/Format.cpp index e16a980bc..cbad1d738 100644 --- a/Foundation/src/Format.cpp +++ b/Foundation/src/Format.cpp @@ -307,8 +307,48 @@ std::string format(const std::string& fmt, const Any& value1, const Any& value2, } -void format(std::string& result, const std::string& fmt, const Any& value) +std::string format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11) { + std::string result; + format(result, fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11); + return result; +} + + +std::string format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12) +{ + std::string result; + format(result, fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12); + return result; +} + + +std::string format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13) +{ + std::string result; + format(result, fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13); + return result; +} + + +std::string format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14) +{ + std::string result; + format(result, fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14); + return result; +} + + +std::string format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15) +{ + std::string result; + format(result, fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15); + return result; +} + + + +void format(std::string& result, const std::string& fmt, const Any& value) { std::vector args; args.push_back(value); format(result, fmt, args); @@ -432,6 +472,106 @@ void format(std::string& result, const std::string& fmt, const Any& value1, cons } +void format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11) +{ + std::vector args; + args.push_back(value1); + args.push_back(value2); + args.push_back(value3); + args.push_back(value4); + args.push_back(value5); + args.push_back(value6); + args.push_back(value7); + args.push_back(value8); + args.push_back(value9); + args.push_back(value10); + args.push_back(value11); + format(result, fmt, args); +} + + +void format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12) +{ + std::vector args; + args.push_back(value1); + args.push_back(value2); + args.push_back(value3); + args.push_back(value4); + args.push_back(value5); + args.push_back(value6); + args.push_back(value7); + args.push_back(value8); + args.push_back(value9); + args.push_back(value10); + args.push_back(value11); + args.push_back(value12); + format(result, fmt, args); +} + + +void format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13) +{ + std::vector args; + args.push_back(value1); + args.push_back(value2); + args.push_back(value3); + args.push_back(value4); + args.push_back(value5); + args.push_back(value6); + args.push_back(value7); + args.push_back(value8); + args.push_back(value9); + args.push_back(value10); + args.push_back(value11); + args.push_back(value12); + args.push_back(value13); + format(result, fmt, args); +} + + +void format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14) +{ + std::vector args; + args.push_back(value1); + args.push_back(value2); + args.push_back(value3); + args.push_back(value4); + args.push_back(value5); + args.push_back(value6); + args.push_back(value7); + args.push_back(value8); + args.push_back(value9); + args.push_back(value10); + args.push_back(value11); + args.push_back(value12); + args.push_back(value13); + args.push_back(value14); + format(result, fmt, args); +} + + +void format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10, const Any& value11, const Any& value12, const Any& value13, const Any& value14, const Any& value15) +{ + std::vector args; + args.push_back(value1); + args.push_back(value2); + args.push_back(value3); + args.push_back(value4); + args.push_back(value5); + args.push_back(value6); + args.push_back(value7); + args.push_back(value8); + args.push_back(value9); + args.push_back(value10); + args.push_back(value11); + args.push_back(value12); + args.push_back(value13); + args.push_back(value14); + args.push_back(value15); + format(result, fmt, args); +} + + void format(std::string& result, const std::string& fmt, const std::vector& values) { std::string::const_iterator itFmt = fmt.begin(); diff --git a/Foundation/testsuite/src/LoggerTest.cpp b/Foundation/testsuite/src/LoggerTest.cpp index d68c53c79..5a4c2be86 100644 --- a/Foundation/testsuite/src/LoggerTest.cpp +++ b/Foundation/testsuite/src/LoggerTest.cpp @@ -233,6 +233,21 @@ void LoggerTest::testFormatAny() root.error("%d%d%d%d%d%d%d%d%d%d", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10); assert(pChannel->getLastMessage().getText() == "12345678910"); + + root.error("%d%d%d%d%d%d%d%d%d%d%d", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); + assert(pChannel->getLastMessage().getText() == "1234567891011"); + + root.error("%d%d%d%d%d%d%d%d%d%d%d%d", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12); + assert(pChannel->getLastMessage().getText() == "123456789101112"); + + root.error("%d%d%d%d%d%d%d%d%d%d%d%d%d", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13); + assert(pChannel->getLastMessage().getText() == "12345678910111213"); + + root.error("%d%d%d%d%d%d%d%d%d%d%d%d%d%d", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14); + assert(pChannel->getLastMessage().getText() == "1234567891011121314"); + + root.error("%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); + assert(pChannel->getLastMessage().getText() == "123456789101112131415"); }