diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-04-12 21:40:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 21:40:29 +0200 |
| commit | b2de380d162c4805edb94808f38a214725d2724e (patch) | |
| tree | 1d8a9e7eea10820e5d645ad5028e506836b856de /Source/Core/InputCommon/ControlReference | |
| parent | 0bfeb37a1f50193d39559d29802cb48f45db2b02 (diff) | |
| parent | 40bb9974f21878e64fb03d70e717cb996bf13a29 (diff) | |
Merge pull request #6635 from spycrab/fix_linter
Tools: Bump lint.sh version
Diffstat (limited to 'Source/Core/InputCommon/ControlReference')
| -rw-r--r-- | Source/Core/InputCommon/ControlReference/ControlReference.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControlReference/ExpressionParser.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp index c7d652f15b..e0d9c8b678 100644 --- a/Source/Core/InputCommon/ControlReference/ControlReference.cpp +++ b/Source/Core/InputCommon/ControlReference/ControlReference.cpp @@ -131,8 +131,8 @@ ciface::Core::Device::Control* InputReference::Detect(const unsigned int ms, // get starting state of all inputs, // so we can ignore those that were activated at time of Detect start - std::vector<ciface::Core::Device::Input *>::const_iterator i = device->Inputs().begin(), - e = device->Inputs().end(); + std::vector<ciface::Core::Device::Input*>::const_iterator i = device->Inputs().begin(), + e = device->Inputs().end(); for (std::vector<bool>::iterator state = states.begin(); i != e; ++i) *state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD)); diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp index 85eb86d598..e7ab53d488 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp @@ -405,6 +405,7 @@ class Parser public: explicit Parser(std::vector<Token> tokens_) : tokens(tokens_) { m_it = tokens.begin(); } ParseResult Parse() { return Toplevel(); } + private: std::vector<Token> tokens; std::vector<Token>::iterator m_it; |
