From d2821e14fa9735ece3be6eec9d6bdf4cf96c1280 Mon Sep 17 00:00:00 2001
From: Michael M <mchtly@gmail.com>
Date: Wed, 7 Jun 2017 14:53:41 -0700
Subject: ParseExpression: return a std::pair

---
 Source/Core/InputCommon/ControlReference/ExpressionParser.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
index f07c9a1326..2d41933e50 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 #include "InputCommon/ControllerInterface/Device.h"
 
 namespace ciface
@@ -66,6 +67,6 @@ enum class ParseStatus
   NoDevice,
 };
 
-ParseStatus ParseExpression(const std::string& expr, ControlFinder& finder, Expression** expr_out);
+std::pair<ParseStatus, Expression*> ParseExpression(const std::string& expr, ControlFinder& finder);
 }
 }
-- 
cgit v1.2.3