diff --git a/src/utility/macros.h b/src/utility/macros.h index 539b6b268..b84cd53b5 100644 --- a/src/utility/macros.h +++ b/src/utility/macros.h @@ -14,11 +14,12 @@ extern log4cplus::Logger logger; #define STORM_LOG_DEBUG(message) \ { \ LOG4CPLUS_DEBUG(logger, message); \ -} while (false) +} while (false) \ + #define STORM_LOG_TRACE(message) \ { \ LOG4CPLUS_TRACE(logger, message); \ -} while (false) +} while (false) \ // Define STORM_LOG_ASSERT which is only checked when NDEBUG is not set. #ifndef NDEBUG @@ -28,7 +29,8 @@ if (!(cond)) { \ LOG4CPLUS_ERROR(logger, message); \ assert(cond); \ } \ -} while (false) +} while (false) \ + #else #define STORM_LOG_ASSERT(cond, message) #endif @@ -39,44 +41,45 @@ assert(cond); \ LOG4CPLUS_ERROR(logger, message); \ throw exception() << message; \ } \ -} while (false) +} while (false) \ + // 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) \ { \ LOG4CPLUS_WARN(logger, message); \ -} while (false) +} while (false) \ #define STORM_LOG_WARN_COND(cond, message) \ { \ if (!(cond)) { \ LOG4CPLUS_WARN(logger, message); \ } \ -} while (false) +} while (false) \ #define STORM_LOG_INFO(message) \ { \ LOG4CPLUS_INFO(logger, message); \ -} while (false) +} while (false) \ #define STORM_LOG_INFO_COND(cond, message) \ { \ if (!(cond)) { \ LOG4CPLUS_INFO(logger, message); \ } \ -} while (false) +} while (false) \ #define STORM_LOG_ERROR(message) \ { \ LOG4CPLUS_ERROR(logger, message); \ -} while (false) +} while (false) \ #define STORM_LOG_ERROR_COND(cond, message) \ { \ if (!(cond)) { \ LOG4CPLUS_ERROR(logger, message); \ } \ -} while (false) +} while (false) \ /*! * Define the macros that print information and optionally also log it. diff --git a/test/performance/storage/MaximalEndComponentDecompositionTest.cpp b/test/performance/storage/MaximalEndComponentDecompositionTest.cpp index 7af8bdb2c..73f53d069 100644 --- a/test/performance/storage/MaximalEndComponentDecompositionTest.cpp +++ b/test/performance/storage/MaximalEndComponentDecompositionTest.cpp @@ -3,6 +3,7 @@ #include "src/parser/AutoParser.h" #include "src/storage/MaximalEndComponentDecomposition.h" #include "src/models/sparse/Mdp.h" +#include "src/models/sparse/StandardRewardModel.h" TEST(MaximalEndComponentDecomposition, AsynchronousLeader) { std::shared_ptr> abstractModel = storm::parser::AutoParser::parseModel(STORM_CPP_BASE_PATH "/examples/mdp/asynchronous_leader/leader7.tra", STORM_CPP_BASE_PATH "/examples/mdp/asynchronous_leader/leader7.lab", "", "");