diff options
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/ControlReference/ExpressionParser.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp index 414a5aa888..30a261d13d 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp @@ -963,11 +963,9 @@ static ParseResult ParseComplexExpression(const std::string& str) void RemoveInertTokens(std::vector<Token>* tokens) { - tokens->erase(std::remove_if(tokens->begin(), tokens->end(), - [](const Token& tok) { - return tok.type == TOK_COMMENT || tok.type == TOK_WHITESPACE; - }), - tokens->end()); + std::erase_if(*tokens, [](const Token& tok) { + return tok.type == TOK_COMMENT || tok.type == TOK_WHITESPACE; + }); } static std::unique_ptr<Expression> ParseBarewordExpression(const std::string& str) diff --git a/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp b/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp index 7b21cf78e0..56bab1a981 100644 --- a/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp +++ b/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp @@ -144,8 +144,7 @@ void RemoveSpuriousTriggerCombinations( }); }; - detections->erase(std::remove_if(detections->begin(), detections->end(), is_spurious), - detections->end()); + std::erase_if(*detections, is_spurious); } } // namespace ciface::MappingCommon |
