From: Mikko Rasa Date: Sun, 8 Jun 2008 23:44:17 +0000 (+0000) Subject: Add a missing include X-Git-Tag: 0.9~3 X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=1238b80d08c1983dfa8914f78b294cd44b1a275b;p=libs%2Fgui.git Add a missing include Fix some gcc 4.3 style warnings --- diff --git a/source/input/control.h b/source/input/control.h index 1ee21c8..5b435dc 100644 --- a/source/input/control.h +++ b/source/input/control.h @@ -8,6 +8,7 @@ Distributed under the LGPL #ifndef MSP_GBASE_CONTROL_H_ #define MSP_GBASE_CONTROL_H_ +#include #include #include diff --git a/source/input/hub.cpp b/source/input/hub.cpp index 51b9717..e696937 100644 --- a/source/input/hub.cpp +++ b/source/input/hub.cpp @@ -39,17 +39,17 @@ std::string Hub::get_button_name(unsigned btn) const void Hub::button_press(unsigned btn, unsigned index) { - set_button_state(index<<12 | btn&0xFFF, true, true); + set_button_state((index<<12) | (btn&0xFFF), true, true); } void Hub::button_release(unsigned btn, unsigned index) { - set_button_state(index<<12 | btn&0xFFF, false, true); + set_button_state((index<<12) | (btn&0xFFF), false, true); } void Hub::axis_motion(unsigned axis, float value, float, unsigned index) { - set_axis_value(index<<12 | axis&0xFFF, value, true); + set_axis_value((index<<12) | (axis&0xFFF), value, true); } } // namespace Input