summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-06-17 16:39:24 -0400
committerLioncash <mathew1800@gmail.com>2019-06-17 16:51:41 -0400
commitec60027f56bde17ef32a80b9f002225542c5859a (patch)
tree3ef54d831d8690467348db2ad69f50868ed0e3fe /Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
parent8e030a4a456cc74289cbed89ee8bbca60c9acc34 (diff)
InputCommon: Use nested namespace specifiers where applicable
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ExpressionParser.cpp')
-rw-r--r--Source/Core/InputCommon/ControlReference/ExpressionParser.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
index a73b1c94cf..c864b22a20 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
@@ -13,12 +13,10 @@
#include "Common/StringUtil.h"
#include "InputCommon/ControlReference/ExpressionParser.h"
+namespace ciface::ExpressionParser
+{
using namespace ciface::Core;
-namespace ciface
-{
-namespace ExpressionParser
-{
enum TokenType
{
TOK_DISCARD,
@@ -557,5 +555,4 @@ std::pair<ParseStatus, std::unique_ptr<Expression>> ParseExpression(const std::s
std::move(complex_result.expr));
return std::make_pair(complex_result.status, std::move(combined_expr));
}
-} // namespace ExpressionParser
-} // namespace ciface
+} // namespace ciface::ExpressionParser