lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed and silenced a few warnings

Browse source
This commit is contained in:
Marco Antognini 2015-11-21 18:44:38 +01:00 • committed by Lukas Dürrenberger
parent c98a84a5d8
commit 9d70da3aaa
7 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/SFML/Window/OSX/HIDInputManager.mm
View file

@ -763,7 +763,7 @@ Keyboard::Key HIDInputManager::nonLocalizedKeys(UniChar virtualKeycode)
case 0x2c: return sf::Keyboard::Slash;
case 0x2a: return sf::Keyboard::BackSlash;
#warning sf::Keyboard::Tilde might be in conflict with some other key.
// sf::Keyboard::Tilde might be in conflict with some other key.
// 0x0a is for "Non-US Backslash" according to HID Calibrator,
// a sample provided by Apple.
case 0x0a: return sf::Keyboard::Tilde;
@ -855,7 +855,7 @@ Keyboard::Key HIDInputManager::nonLocalizedKeys(UniChar virtualKeycode)
case NSPauseFunctionKey: return sf::Keyboard::Pause;
#warning keycode 0x1b is not bound to any key.
// keycode 0x1b is not bound to any key.
// This key is ' on CH-FR, ) on FR and - on US layouts.
// An unknown key.

4
src/SFML/Window/OSX/HIDJoystickManager.cpp
View file

@ -133,7 +133,7 @@ void HIDJoystickManager::update()
////////////////////////////////////////////////////////////
void HIDJoystickManager::pluggedIn(void* context, IOReturn, void*, IOHIDDeviceRef)
{
HIDJoystickManager* manager = (HIDJoystickManager*)context;
HIDJoystickManager* manager = static_cast<HIDJoystickManager*>(context);
manager->m_joystickCount++;
}
@ -141,7 +141,7 @@ void HIDJoystickManager::pluggedIn(void* context, IOReturn, void*, IOHIDDeviceRe
////////////////////////////////////////////////////////////
void HIDJoystickManager::pluggedOut(void* context, IOReturn, void*, IOHIDDeviceRef)
{
HIDJoystickManager* manager = (HIDJoystickManager*)context;
HIDJoystickManager* manager = static_cast<HIDJoystickManager*>(context);
manager->m_joystickCount--;
}