Merge pull request #12399 from lioncash/erasing

General: Make use of std::erase_if/std::erase where applicable

1 files changed, 3 insertions, 5 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)