diff options
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/joystick.cpp | 2 | ||||
| -rw-r--r-- | src/input/joystick.h | 2 | ||||
| -rw-r--r-- | src/input/touch/touchmanager.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp index 5e0392c8e..0c859f50d 100644 --- a/src/input/joystick.cpp +++ b/src/input/joystick.cpp @@ -281,7 +281,7 @@ bool Joystick::buttonPressed(const unsigned char no) const return (mEnabled && no < MAX_BUTTONS) ? mActiveButtons[no] : false; } -void Joystick::getNames(std::vector <std::string> &names) +void Joystick::getNames(STD_VECTOR <std::string> &names) { names.clear(); for (int i = 0; i < joystickCount; i++) diff --git a/src/input/joystick.h b/src/input/joystick.h index 11e54f632..cb4b7a78d 100644 --- a/src/input/joystick.h +++ b/src/input/joystick.h @@ -85,7 +85,7 @@ class Joystick final constexpr2 static void setEnabled(const bool enabled) noexcept2 { mEnabled = enabled; } - static void getNames(std::vector <std::string> &names); + static void getNames(STD_VECTOR <std::string> &names); /** * Updates the direction and button information. diff --git a/src/input/touch/touchmanager.h b/src/input/touch/touchmanager.h index 6727b9b08..0b9187968 100644 --- a/src/input/touch/touchmanager.h +++ b/src/input/touch/touchmanager.h @@ -94,7 +94,7 @@ struct TouchItem final TouchFuncPtr funcOut; }; -typedef std::vector<TouchItem*> TouchItemVector; +typedef STD_VECTOR<TouchItem*> TouchItemVector; typedef TouchItemVector::const_iterator TouchItemVectorCIter; typedef TouchItemVector::iterator TouchItemVectorIter; |