Browse Source

Fix some typos in l3pp usage

Former-commit-id: c9da06a596
tempestpy_adaptions
hbruintjes 9 years ago
parent
commit
4e4bc255b5
  1. 2
      src/utility/initialize.cpp
  2. 12
      src/utility/logging.h

2
src/utility/initialize.cpp

@ -19,7 +19,7 @@ namespace storm {
l3pp::FormatterPtr fptr = l3pp::makeTemplateFormatter( l3pp::FormatterPtr fptr = l3pp::makeTemplateFormatter(
l3pp::FieldStr<l3pp::Field::LogLevel, 5, l3pp::Justification::LEFT>(), l3pp::FieldStr<l3pp::Field::LogLevel, 5, l3pp::Justification::LEFT>(),
' (', l3pp::FieldStr<l3pp::Field::FileName>, ':', l3pp::FieldStr<l3pp::Field::Line>, '): ',
" (", l3pp::FieldStr<l3pp::Field::FileName>(), ':', l3pp::FieldStr<l3pp::Field::Line>(), "): ",
l3pp::FieldStr<l3pp::Field::Message>(), '\n' l3pp::FieldStr<l3pp::Field::Message>(), '\n'
); );
sink->setFormatter(fptr); sink->setFormatter(fptr);

12
src/utility/logging.h

@ -1,23 +1,23 @@
#ifndef STORM_UTILITY_LOGGING_H_ #ifndef STORM_UTILITY_LOGGING_H_
#define STORM_UTILITY_LOGGING_H_ #define STORM_UTILITY_LOGGING_H_
#include <l3pp/logging.h>
#include <l3pp.h>
#if !defined(STORM_LOG_DISABLE_DEBUG) && !defined(STORM_LOG_DISABLE_TRACE) #if !defined(STORM_LOG_DISABLE_DEBUG) && !defined(STORM_LOG_DISABLE_TRACE)
#define STORM_LOG_TRACE(message) L3PP_LOG_TRACE(l3pp::Logging::getRootLogger(), message)
#define STORM_LOG_TRACE(message) L3PP_LOG_TRACE(l3pp::Logger::getRootLogger(), message)
#else #else
#define STORM_LOG_TRACE(message) (void)(0) #define STORM_LOG_TRACE(message) (void)(0)
#endif #endif
#if !defined(STORM_LOG_DISABLE_DEBUG) #if !defined(STORM_LOG_DISABLE_DEBUG)
#define STORM_LOG_DEBUG(message) L3PP_LOG_DEBUG(l3pp::Logging::getRootLogger(), message)
#define STORM_LOG_DEBUG(message) L3PP_LOG_DEBUG(l3pp::Logger::getRootLogger(), message)
#else #else
#define STORM_LOG_DEBUG(message) (void)(0) #define STORM_LOG_DEBUG(message) (void)(0)
#endif #endif
// Define STORM_LOG_WARN, STORM_LOG_ERROR and STORM_LOG_INFO to log the given message with the corresponding log levels. // Define STORM_LOG_WARN, STORM_LOG_ERROR and STORM_LOG_INFO to log the given message with the corresponding log levels.
#define STORM_LOG_INFO(message) L3PP_LOG_INFO(l3pp::Logging::getRootLogger(), message)
#define STORM_LOG_WARN(message) L3PP_LOG_WARN(l3pp::Logging::getRootLogger(), message)
#define STORM_LOG_ERROR(message) L3PP_LOG_ERROR(l3pp::Logging::getRootLogger(), message)
#define STORM_LOG_INFO(message) L3PP_LOG_INFO(l3pp::Logger::getRootLogger(), message)
#define STORM_LOG_WARN(message) L3PP_LOG_WARN(l3pp::Logger::getRootLogger(), message)
#define STORM_LOG_ERROR(message) L3PP_LOG_ERROR(l3pp::Logger::getRootLogger(), message)
#endif /* STORM_UTILITY_LOGGING_H_ */ #endif /* STORM_UTILITY_LOGGING_H_ */
Loading…
Cancel
Save