summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-20 02:08:44 +0100
committerPierre Bourdon <delroth@gmail.com>2014-02-20 02:08:44 +0100
commit6d8df311a32cd9841aa9fa81228f3ba5180d26be (patch)
treecfa2e210a36bbe5063fdbc23e4cbbfd3d78b63a4 /Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
parentafba0d736d363fa4c71b86d84a1caad3d52f147e (diff)
parent24ba058404d8036a977a41e55c58a7326302cb34 (diff)
Merge pull request #88 from lioncash/relative-includes
Relative includes
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
index 802d1b8f0f..4e2f49f4d0 100644
--- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
@@ -2,14 +2,15 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "ExpressionParser.h"
-
+#include <algorithm>
#include <cassert>
#include <iostream>
-#include <string>
#include <map>
+#include <string>
#include <vector>
+#include "InputCommon/ControllerInterface/ExpressionParser.h"
+
using namespace ciface::Core;
namespace ciface