Add a missing include

Fix some gcc 4.3 style warnings

diff --git a/source/input/control.h b/source/input/control.h
index 1ee21c8af072f5e305710c28597055d50482382b..5b435dcf0a1f478ee0994657998bd87e09eaec9e 100644 (file)
--- 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 <string>
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
 

diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index 51b971748170c60599a09c65afe687c2238e2645..e6969372f9240c728d6b15deeb2f0f591caefe98 100644 (file)
--- 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