From 67ee3168a45ea09a863de5be2e0a94cf1afbe6dc Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 24 Dec 2015 18:26:52 +0300 Subject: Fix compilation with clang. --- src/touchmanager.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/touchmanager.h') diff --git a/src/touchmanager.h b/src/touchmanager.h index 99d904765..f67a2b72d 100644 --- a/src/touchmanager.h +++ b/src/touchmanager.h @@ -113,7 +113,7 @@ class TouchManager final : public ConfigListener RIGHT = 2 }; - void init() restrict; + void init() restrict2; void loadTouchItem(TouchItem **restrict item, const std::string &restrict name, @@ -128,22 +128,22 @@ class TouchManager final : public ConfigListener const TouchFuncPtr fPressed = nullptr, const TouchFuncPtr fReleased = nullptr, const TouchFuncPtr fOut = nullptr) - restrict A_NONNULL(2); + restrict2 A_NONNULL(2); - void clear() restrict; + void clear() restrict2; - void draw() restrict; + void draw() restrict2; - void safeDraw() restrict; + void safeDraw() restrict2; - void drawText() restrict; + void drawText() restrict2; - bool processEvent(const MouseInput &mouseInput) restrict; + bool processEvent(const MouseInput &mouseInput) restrict2; - bool isActionActive(const InputActionT index) restrict const; + bool isActionActive(const InputActionT index) restrict2 const; void setActionActive(const InputActionT index, - const bool value) restrict + const bool value) restrict2 { if (static_cast(index) >= 0 && static_cast(index) < actionsSize) @@ -152,28 +152,28 @@ class TouchManager final : public ConfigListener } } - void resize(const int width, const int height) restrict; + void resize(const int width, const int height) restrict2; static void unload(TouchItem *restrict const item); - void unloadTouchItem(TouchItem *restrict *unloadItem) restrict; + void unloadTouchItem(TouchItem *restrict *unloadItem) restrict2; - void optionChanged(const std::string &value) restrict override final; + void optionChanged(const std::string &value) restrict2 override final; - void loadPad() restrict; + void loadPad() restrict2; - void loadButtons() restrict; + void loadButtons() restrict2; - void loadKeyboard() restrict; + void loadKeyboard() restrict2; - int getPadSize() restrict const + int getPadSize() restrict2 const { return (mJoystickSize + 2) * 50; } - void setInGame(const bool b) restrict; + void setInGame(const bool b) restrict2; - void setTempHide(const bool b) restrict; + void setTempHide(const bool b) restrict2; - void shutdown() restrict; + void shutdown() restrict2; static void executeAction(const std::string &restrict event); -- cgit v1.2.3-70-g09d2