diff options
| author | Scott Mansell <phiren@gmail.com> | 2015-09-10 14:48:30 +1200 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2015-09-10 14:48:30 +1200 |
| commit | f2771695a29e17201ac925eaca1aa7204cea93ca (patch) | |
| tree | 1ba697fedeb132863290891a06653b2b83c623b1 /Source/Core | |
| parent | 38d05cd70f858c7c86e6ed2aab9bd0258157f1d0 (diff) | |
| parent | 88c9c6d0861827ad476683afe01f19868d14cd38 (diff) | |
Merge pull request #3014 from lioncash/cpath
ExpressionParser: Make all control paths return a value in operator std::string
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp index 40d61b0e77..bcb2c95a96 100644 --- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp @@ -63,8 +63,6 @@ public: { switch (type) { - case TOK_INVALID: - return "Invalid"; case TOK_DISCARD: return "Discard"; case TOK_EOF: @@ -83,7 +81,11 @@ public: return "+"; case TOK_CONTROL: return "Device(" + (std::string)qualifier + ")"; + case TOK_INVALID: + break; } + + return "Invalid"; } }; |