summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-07-25 00:58:04 +0200
committerPierre Bourdon <delroth@gmail.com>2014-07-25 00:58:04 +0200
commite3dde592b68aa219a833650d61638e63217fc71a (patch)
tree1cdf7842dad2580e0e6216b7e8fa5d84bb2598f9 /Source/Core/InputCommon/ControllerInterface
parente91db62f1be2eeeb3fb3d5f71cfafcfcb98e13a5 (diff)
parent6186a293f697c2b1f629e2cda04652fbafaa14bb (diff)
Merge pull request #668 from lioncash/include
InputCommon: Include the algorithm header in ForceFeedbackDevice
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
index 57abcb1b1f..80b1ac4fd7 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
@@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
+#include <algorithm>
#include <string>
#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"
@@ -67,7 +68,7 @@ bool ForceFeedbackDevice::InitForceFeedback(const LPDIRECTINPUTDEVICE8 device, i
eff.dwGain = DI_FFNOMINALMAX;
eff.dwTriggerButton = DIEB_NOTRIGGER;
eff.dwTriggerRepeatInterval = 0;
- eff.cAxes = std::min((DWORD)1, (DWORD)cAxes);
+ eff.cAxes = std::min<DWORD>(1, cAxes);
eff.rgdwAxes = rgdwAxes;
eff.rglDirection = rglDirection;