aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/compositevalidator.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2019-07-14 21:00:05 +0200
committerRenaud G <renaud@rolisteam.org>2019-09-15 19:22:15 +0200
commit5697690e3a260d3f00603492305f410c3f307754 (patch)
tree63e95951efd0fecedd33402b6e80ad5db49f0f63 /compositevalidator.cpp
parent5130c2550515fa905f09f2b929b31b591034a4bf (diff)
downloadOneRoll-5697690e3a260d3f00603492305f410c3f307754.tar.gz
OneRoll-5697690e3a260d3f00603492305f410c3f307754.zip
Fix compilation on windows
Diffstat (limited to 'compositevalidator.cpp')
-rw-r--r--compositevalidator.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/compositevalidator.cpp b/compositevalidator.cpp
index 5116b16..158df72 100644
--- a/compositevalidator.cpp
+++ b/compositevalidator.cpp
@@ -136,15 +136,15 @@ Dice::CONDITION_STATE CompositeValidator::isValidRangeSize(const std::pair<qint6
m_validatorList.begin(), m_validatorList.end(), std::back_inserter(vec),
[range](Validator* validator) -> Dice::CONDITION_STATE { return validator->isValidRangeSize(range); });
- auto itError= std::find(vec.begin(), vec.end(), Dice::CONDITION_STATE::ERROR);
+ auto itError= std::find(vec.begin(), vec.end(), Dice::CONDITION_STATE::ERROR_STATE);
if((static_cast<int>(vec.size()) != m_operators.size() + 1) || (itError != vec.end()))
{
- return Dice::CONDITION_STATE::ERROR;
+ return Dice::CONDITION_STATE::ERROR_STATE;
}
std::size_t i= 0;
- Dice::CONDITION_STATE val;
+ Dice::CONDITION_STATE val = Dice::CONDITION_STATE::ERROR_STATE;
for(const auto& op : m_operators)
{
auto currentState= vec[i + 1];
@@ -164,7 +164,7 @@ Dice::CONDITION_STATE CompositeValidator::isValidRangeSize(const std::pair<qint6
val= testXOR(val, currentState);
break;
case NONE:
- val= Dice::CONDITION_STATE::ERROR;
+ val= Dice::CONDITION_STATE::ERROR_STATE;
break;
}