From cb8fbe872e86705136bd1fa5f50b2bccfbb9b50a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 22 Nov 2019 14:44:33 -0500 Subject: [PATCH] InputCommon/FunctionExpression: Collapse namespaces Since we target C++17, we can collapse the namespaces into a single declaration specifier. --- .../InputCommon/ControlReference/FunctionExpression.cpp | 7 ++----- .../Core/InputCommon/ControlReference/FunctionExpression.h | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp b/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp index f1cdc690a3..8bfd57402d 100644 --- a/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp +++ b/Source/Core/InputCommon/ControlReference/FunctionExpression.cpp @@ -8,9 +8,7 @@ #include #include -namespace ciface -{ -namespace ExpressionParser +namespace ciface::ExpressionParser { constexpr int LOOP_MAX_REPS = 10000; constexpr ControlState CONDITION_THRESHOLD = 0.5; @@ -523,5 +521,4 @@ void FunctionExpression::SetValue(ControlState) { } -} // namespace ExpressionParser -} // namespace ciface +} // namespace ciface::ExpressionParser diff --git a/Source/Core/InputCommon/ControlReference/FunctionExpression.h b/Source/Core/InputCommon/ControlReference/FunctionExpression.h index f5332a0d25..fb0b2a7da0 100644 --- a/Source/Core/InputCommon/ControlReference/FunctionExpression.h +++ b/Source/Core/InputCommon/ControlReference/FunctionExpression.h @@ -12,9 +12,7 @@ #include "InputCommon/ControlReference/ExpressionParser.h" #include "InputCommon/ControlReference/FunctionExpression.h" -namespace ciface -{ -namespace ExpressionParser +namespace ciface::ExpressionParser { class FunctionExpression : public Expression { @@ -51,5 +49,4 @@ private: std::unique_ptr MakeFunctionExpression(std::string name); -} // namespace ExpressionParser -} // namespace ciface +} // namespace ciface::ExpressionParser