summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
diff options
context:
space:
mode:
authorSoren Jorvang <soren.jorvang@gmail.com>2011-01-28 21:27:49 +0000
committerSoren Jorvang <soren.jorvang@gmail.com>2011-01-28 21:27:49 +0000
commit08b923a1639e5545a700e5cf231c362ae9906d9d (patch)
tree617e16051d99bcfb2d149152542edf0e86d2c647 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
parentf28304197065d90bbb7fa787be7677c9089812e6 (diff)
Fix OS X build.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6951 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp')
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index 69e340d4f5..26c2d34474 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -470,7 +470,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
else if ('`' == c)
{
// different device
- if (false == std::getline(ss, dev_str, '`'))
+ if (false == /*XXX*/(bool)std::getline(ss, dev_str, '`'))
break;
}
else