diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2019-06-18 11:33:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-18 11:33:08 +0200 |
| commit | ff96dc0e6ffd250b23ccb5ebceb12623da604435 (patch) | |
| tree | 1a1279d6bff0945ae575c195ec357af239896d8f /Source/Core/InputCommon/ControlReference/ExpressionParser.cpp | |
| parent | ac562279c3a9fe9cc660b703ed0fd3f8ab2be758 (diff) | |
| parent | 72b04a353ddfa79ec10fe447bef8eeaefc824976 (diff) | |
Merge pull request #8199 from lioncash/namespace
General: Use nested namespace specifiers where applicable
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ExpressionParser.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControlReference/ExpressionParser.cpp | 9 |
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 |
