logger functions do not have loglevel arguments anymore, they are handled in the macros

master
Denes Matetelki 14 years ago
parent c21f3560f9
commit fe5c8ea507

@ -33,14 +33,12 @@ public:
static void setLogLevel ( const LogLevel loglevel ); static void setLogLevel ( const LogLevel loglevel );
inline static LogLevel getLoglevel() { return m_logLevel; } inline static LogLevel getLoglevel() { return m_logLevel; }
static void log_pointer( const LogLevel loglevel, static void log_pointer( const void* msg,
const void* msg,
const char* file, const char* file,
int line, int line,
const char* function); const char* function);
static void log_string( const LogLevel loglevel, static void log_string( const char* msg,
const char* msg,
const char* file, const char* file,
int line, int line,
const char* function); const char* function);
@ -69,7 +67,7 @@ private:
if(MAX_LOFLEVEL >= Logger::FINEST && \ if(MAX_LOFLEVEL >= Logger::FINEST && \
Logger::getInstance()->getLoglevel() >= Logger::FINEST ) \ Logger::getInstance()->getLoglevel() >= Logger::FINEST ) \
Logger::getInstance()->log_pointer( \ Logger::getInstance()->log_pointer( \
Logger::FINEST, this, __FILE__, __LINE__, __PRETTY_FUNCTION__); \ this, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
else (void)0 else (void)0
@ -77,7 +75,7 @@ else (void)0
if (MAX_LOFLEVEL >= level && \ if (MAX_LOFLEVEL >= level && \
Logger::getInstance()->getLoglevel() >= Logger::FINEST ) \ Logger::getInstance()->getLoglevel() >= Logger::FINEST ) \
Logger::getInstance()->log_string( \ Logger::getInstance()->log_string( \
level, msg, __FILE__, __LINE__, __PRETTY_FUNCTION__); \ msg, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
else (void)0 else (void)0

@ -16,8 +16,7 @@ void Logger::setLogLevel ( const LogLevel loglevel )
void Logger::log_pointer( const LogLevel loglevel, void Logger::log_pointer( const void* msg,
const void* msg,
const char* file, const char* file,
int line, int line,
const char* function) const char* function)
@ -31,8 +30,7 @@ void Logger::log_pointer( const LogLevel loglevel,
} }
void Logger::log_string( const LogLevel loglevel, void Logger::log_string( const char* msg,
const char* msg,
const char* file, const char* file,
int line, int line,
const char* function) const char* function)

@ -98,7 +98,7 @@ lcov -r lcov.info "g++-v*" -o lcov.info
lcov -r lcov.info "/usr/include/cxxtest*" -o lcov.info lcov -r lcov.info "/usr/include/cxxtest*" -o lcov.info
lcov -r lcov.info "*cpp_utils/test*" -o lcov.info lcov -r lcov.info "*cpp_utils/test*" -o lcov.info
echo -e "${pre}Generating HTML${post}" echo -e "${pre}Generating coverage HTML${post}"
rm -rf ./cov rm -rf ./cov
mkdir cov mkdir cov
genhtml --frames --legend -o ./cov lcov.info genhtml --frames --legend -o ./cov lcov.info

Loading…
Cancel
Save