From cb8fbe872e86705136bd1fa5f50b2bccfbb9b50a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 22 Nov 2019 14:44:33 -0500
Subject: InputCommon/FunctionExpression: Collapse namespaces

Since we target C++17, we can collapse the namespaces into a single
declaration specifier.
---
 Source/Core/InputCommon/ControlReference/FunctionExpression.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'Source/Core/InputCommon/ControlReference/FunctionExpression.h')

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<FunctionExpression> MakeFunctionExpression(std::string name);
 
-}  // namespace ExpressionParser
-}  // namespace ciface
+}  // namespace ciface::ExpressionParser
-- 
cgit v1.2.3


From 64bc6f53fd22fabedeef56016080d5996a144fdb Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 22 Nov 2019 14:48:10 -0500
Subject: InputCommon/FunctionExpression: Remove cyclical include

This header was including itself, which is likely not intended.
---
 Source/Core/InputCommon/ControlReference/FunctionExpression.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Core/InputCommon/ControlReference/FunctionExpression.h')

diff --git a/Source/Core/InputCommon/ControlReference/FunctionExpression.h b/Source/Core/InputCommon/ControlReference/FunctionExpression.h
index fb0b2a7da0..44d9092ce9 100644
--- a/Source/Core/InputCommon/ControlReference/FunctionExpression.h
+++ b/Source/Core/InputCommon/ControlReference/FunctionExpression.h
@@ -9,8 +9,8 @@
 #include <variant>
 #include <vector>
 
+#include "Common/CommonTypes.h"
 #include "InputCommon/ControlReference/ExpressionParser.h"
-#include "InputCommon/ControlReference/FunctionExpression.h"
 
 namespace ciface::ExpressionParser
 {
-- 
cgit v1.2.3


From 10fea99d8049d3224f736bcfaa1cf981fa0d14ec Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 22 Nov 2019 14:51:57 -0500
Subject: InputCommon/FunctionExpression: Make MakeFunctionExpression() take a
 std::string_view

There's nothing within this function that requires a copy of the string
to be made, so we can make use of a non-owning view
---
 Source/Core/InputCommon/ControlReference/FunctionExpression.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Source/Core/InputCommon/ControlReference/FunctionExpression.h')

diff --git a/Source/Core/InputCommon/ControlReference/FunctionExpression.h b/Source/Core/InputCommon/ControlReference/FunctionExpression.h
index 44d9092ce9..e247d9a623 100644
--- a/Source/Core/InputCommon/ControlReference/FunctionExpression.h
+++ b/Source/Core/InputCommon/ControlReference/FunctionExpression.h
@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <string>
+#include <string_view>
 #include <variant>
 #include <vector>
 
@@ -47,6 +48,6 @@ private:
   std::vector<std::unique_ptr<Expression>> m_args;
 };
 
-std::unique_ptr<FunctionExpression> MakeFunctionExpression(std::string name);
+std::unique_ptr<FunctionExpression> MakeFunctionExpression(std::string_view name);
 
 }  // namespace ciface::ExpressionParser
-- 
cgit v1.2.3