diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-28 21:27:49 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-28 21:27:49 +0000 |
| commit | 08b923a1639e5545a700e5cf231c362ae9906d9d (patch) | |
| tree | 617e16051d99bcfb2d149152542edf0e86d2c647 /Source/Core/InputCommon/Src/ControllerInterface | |
| parent | f28304197065d90bbb7fa787be7677c9089812e6 (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')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/OSX/NamedKeys.h | 4 |
2 files changed, 3 insertions, 3 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 diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/NamedKeys.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/NamedKeys.h index ecb637cc07..40d16b1d92 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/NamedKeys.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/NamedKeys.h @@ -166,9 +166,9 @@ { kHIDUsage_KeyboardLeftControl, "Left Control" }, { kHIDUsage_KeyboardLeftShift, "Left Shift" }, { kHIDUsage_KeyboardLeftAlt, "Left Alt" }, -{ kHIDUsage_KeyboardLeftGUI, "Left GUI" }, +{ kHIDUsage_KeyboardLeftGUI, "Left Command" }, { kHIDUsage_KeyboardRightControl, "Right Control" }, { kHIDUsage_KeyboardRightShift, "Right Shift" }, { kHIDUsage_KeyboardRightAlt, "Right Alt" }, -{ kHIDUsage_KeyboardRightGUI, "Right GUI" }, +{ kHIDUsage_KeyboardRightGUI, "Right Command" }, /* 0x4E - 0xFFFF Reserved */ |