summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference
diff options
context:
space:
mode:
authorPokechu22 <Pokechu022@gmail.com>2021-09-03 21:43:19 -0700
committerPokechu22 <Pokechu022@gmail.com>2021-10-13 12:32:16 -0700
commit78bfd25964206a1f0a34170fdd90ca1a8ce242db (patch)
tree93aeabec56ac75e8d88baeb6f78e27840d09dead /Source/Core/InputCommon/ControlReference
parent525e6b21943b09172043797535db6a2890c45805 (diff)
Fix all uninitialized variable warnings (C26495)
Diffstat (limited to 'Source/Core/InputCommon/ControlReference')
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.cpp4
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.h5
-rw-r--r--Source/Core/InputCommon/ControlReference/ExpressionParser.h2
3 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
index 4bdfbddfef..795204cc05 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.cpp
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
@@ -58,9 +58,7 @@ std::optional<std::string> ControlReference::SetExpression(std::string expr)
return parse_result.description;
}
-ControlReference::ControlReference() : range(1), m_parsed_expression(nullptr)
-{
-}
+ControlReference::ControlReference() = default;
ControlReference::~ControlReference() = default;
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.h b/Source/Core/InputCommon/ControlReference/ControlReference.h
index da6e10a5c2..f12e354bb3 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.h
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.h
@@ -41,13 +41,14 @@ public:
// Returns a human-readable error description when the given expression is invalid.
std::optional<std::string> SetExpression(std::string expr);
- ControlState range;
+ ControlState range = 1;
protected:
ControlReference();
std::string m_expression;
std::unique_ptr<ciface::ExpressionParser::Expression> m_parsed_expression;
- ciface::ExpressionParser::ParseStatus m_parse_status;
+ ciface::ExpressionParser::ParseStatus m_parse_status =
+ ciface::ExpressionParser::ParseStatus::EmptyExpression;
};
template <>
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
index 16554738eb..405445b8a0 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
@@ -181,7 +181,7 @@ public:
static ParseResult MakeSuccessfulResult(std::unique_ptr<Expression>&& expr);
static ParseResult MakeErrorResult(Token token, std::string description);
- ParseStatus status;
+ ParseStatus status = ParseStatus::EmptyExpression;
std::unique_ptr<Expression> expr;
// Used for parse errors: