From 4b3d4a7c114a20c38c44c4c9cbd56eaf3e569664 Mon Sep 17 00:00:00 2001 From: PBerger Date: Sun, 22 Sep 2013 21:42:17 +0200 Subject: [PATCH] Removed buggy logging in setup-routines Former-commit-id: ba579539474e59a1a65d9851bc9ce17ad1dcbd48 --- src/settings/ArgumentBuilder.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/settings/ArgumentBuilder.h b/src/settings/ArgumentBuilder.h index 3bf4f7bd5..b608bee28 100644 --- a/src/settings/ArgumentBuilder.h +++ b/src/settings/ArgumentBuilder.h @@ -79,13 +79,11 @@ namespace storm { #define PPCAT(A, B) PPCAT_NX(A, B) #define MACROaddValidationFunction(funcName, funcType) ArgumentBuilder& PPCAT(addValidationFunction, funcName) (storm::settings::Argument< funcType >::userValidationFunction_t userValidationFunction) { \ if (this->argumentType != ArgumentType::funcName) { \ - LOG4CPLUS_ERROR(logger, "ArgumentBuilder::addValidationFunction: Tried adding a Validation-Function for a \"" << ArgumentTypeHelper::toString(ArgumentType::funcName) << "\" Argument, but this Argument is configured to be of Type \"" << ArgumentTypeHelper::toString(this->argumentType) << "\"."); \ throw storm::exceptions::IllegalFunctionCallException() << "Tried adding a Validation-Function for a \"" << ArgumentTypeHelper::toString(ArgumentType::funcName) << "\" Argument, but this Argument is configured to be of Type \"" << ArgumentTypeHelper::toString(this->argumentType) << "\"."; \ } \ ( PPCAT(this->userValidationFunction_, funcName) ).push_back(userValidationFunction); \ std::string errorMessageTarget = ""; \ if (this->hasDefaultValue && !this->validateDefaultForEach(errorMessageTarget)) { \ - LOG4CPLUS_ERROR(logger, "ArgumentBuilder::addValidationFunction: Tried adding a Validation-Function for an Argument which has a Default Value set which is rejected by this Validation-Function:\r\n" << errorMessageTarget); \ throw storm::exceptions::IllegalArgumentValueException() << "Tried adding a Validation-Function for an Argument which has a Default Value set which is rejected by this Validation-Function:\r\n" << errorMessageTarget; \ } \ return *this; \ @@ -100,13 +98,11 @@ namespace storm { #define MACROsetDefaultValue(funcName, funcType) ArgumentBuilder& PPCAT(setDefaultValue, funcName) (funcType const& defaultValue) { \ if (this->argumentType != ArgumentType::funcName) { \ - LOG4CPLUS_ERROR(logger, "ArgumentBuilder::addValidationFunction: Tried adding a default Value for a \"" << ArgumentTypeHelper::toString(ArgumentType::String) << "\" Argument, but the Argument \"" << this->argumentName << "\" is configured to be of Type \"" << ArgumentTypeHelper::toString(this->argumentType) << "\"."); \ throw storm::exceptions::IllegalFunctionCallException() << "Tried adding a default Value for a \"" << ArgumentTypeHelper::toString(ArgumentType::String) << "\" Argument, but the Argument \"" << this->argumentName << "\" is configured to be of Type \"" << ArgumentTypeHelper::toString(this->argumentType) << "\"."; \ } \ PPCAT(this->defaultValue_, funcName) = defaultValue; \ std::string errorMessageTarget = ""; \ if (!this->validateDefaultForEach(errorMessageTarget)) { \ - LOG4CPLUS_ERROR(logger, "ArgumentBuilder::setDefaultValue: Tried adding a default Value for the Argument \"" << this->argumentName << "\", but a Validation Function rejected it:\r\n" << errorMessageTarget); \ throw storm::exceptions::IllegalArgumentValueException() << "Tried adding a default Value for the Argument \"" << this->argumentName << "\", but a Validation Function rejected it:\r\n" << errorMessageTarget; \ } \ this->hasDefaultValue = true; \ @@ -121,7 +117,6 @@ namespace storm { ArgumentBase* build() { if (this->hasBeenBuild) { - LOG4CPLUS_ERROR(logger, "ArgumentBuilder::build: Called build() on an instance of ArgumentBuilder which has already build an Instance."); throw storm::exceptions::IllegalFunctionCallException() << "Called build() on an instance of ArgumentBuilder which has already build an Instance."; } this->hasBeenBuild = true; @@ -163,7 +158,6 @@ namespace storm { } break; default: { - LOG4CPLUS_ERROR(logger, "ArgumentBuilder::build: Missing Case in ArgumentBuilder's switch/case Code."); throw storm::exceptions::InternalTypeErrorException() << "Missing Case in ArgumentBuilder's switch/case Code."; } } @@ -252,7 +246,6 @@ namespace storm { } break; default: { - LOG4CPLUS_ERROR(logger, "ArgumentBuilder::build: Missing Case in ArgumentBuilder's switch/case Code."); throw storm::exceptions::InternalTypeErrorException() << "Error: Missing Case in ArgumentBuilder's switch/case Code."; } }