Browse Source

fixed the warnings related to our macros

Former-commit-id: 526b6ea956
tempestpy_adaptions
dehnert 9 years ago
parent
commit
b88165f27c
  1. 2
      src/settings/OptionBuilder.h
  2. 20
      src/utility/macros.h

2
src/settings/OptionBuilder.h

@ -85,7 +85,7 @@ namespace storm {
* @return The resulting option.
*/
std::shared_ptr<Option> build() {
STORM_LOG_THROW(!this->isBuild, storm::exceptions::IllegalFunctionCallException, "Cannot rebuild an option with one builder.")
STORM_LOG_THROW(!this->isBuild, storm::exceptions::IllegalFunctionCallException, "Cannot rebuild an option with one builder.");
this->isBuild = true;
if (this->hasShortName) {

20
src/utility/macros.h

@ -12,19 +12,19 @@ extern log4cplus::Logger logger;
* Define the macros STORM_LOG_DEBUG and STORM_LOG_TRACE.
*/
#define STORM_LOG_DEBUG(message) \
{ \
do { \
LOG4CPLUS_DEBUG(logger, message); \
} while (false) \
#define STORM_LOG_TRACE(message) \
{ \
do { \
LOG4CPLUS_TRACE(logger, message); \
} while (false) \
// Define STORM_LOG_ASSERT which is only checked when NDEBUG is not set.
#ifndef NDEBUG
#define STORM_LOG_ASSERT(cond, message) \
{ \
do { \
if (!(cond)) { \
LOG4CPLUS_ERROR(logger, message); \
assert(cond); \
@ -36,7 +36,7 @@ assert(cond); \
#endif
// Define STORM_LOG_THROW to always throw the exception with the given message if the condition fails to hold.
#define STORM_LOG_THROW(cond, exception, message) \
{ \
do { \
if (!(cond)) { \
LOG4CPLUS_ERROR(logger, message); \
throw exception() << message; \
@ -46,36 +46,36 @@ assert(cond); \
// 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(message) \
{ \
do { \
LOG4CPLUS_WARN(logger, message); \
} while (false) \
#define STORM_LOG_WARN_COND(cond, message) \
{ \
do { \
if (!(cond)) { \
LOG4CPLUS_WARN(logger, message); \
} \
} while (false) \
#define STORM_LOG_INFO(message) \
{ \
do { \
LOG4CPLUS_INFO(logger, message); \
} while (false) \
#define STORM_LOG_INFO_COND(cond, message) \
{ \
do { \
if (!(cond)) { \
LOG4CPLUS_INFO(logger, message); \
} \
} while (false) \
#define STORM_LOG_ERROR(message) \
{ \
do { \
LOG4CPLUS_ERROR(logger, message); \
} while (false) \
#define STORM_LOG_ERROR_COND(cond, message) \
{ \
do { \
if (!(cond)) { \
LOG4CPLUS_ERROR(logger, message); \
} \

Loading…
Cancel
Save