From 5103113740598ec5bee8d5eef168cb531578daca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 15 Apr 2017 15:21:41 +0200 Subject: [PATCH] Mark Factory variables as maybe_unused --- src/openrct2/actions/PlaceParkEntranceAction.cpp | 2 +- src/openrct2/actions/SetParkEntranceFeeAction.cpp | 2 +- src/openrct2/common.h | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/openrct2/actions/PlaceParkEntranceAction.cpp b/src/openrct2/actions/PlaceParkEntranceAction.cpp index 0ebd1403a0..e0ec265bab 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.cpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.cpp @@ -216,7 +216,7 @@ public: } }; -static auto Factory = GameActions::Register(GAME_COMMAND_PLACE_PARK_ENTRANCE); +static auto Factory UNUSED_ATTR = GameActions::Register(GAME_COMMAND_PLACE_PARK_ENTRANCE); extern "C" { diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.cpp b/src/openrct2/actions/SetParkEntranceFeeAction.cpp index df45b3bc16..1a9b2fb06c 100644 --- a/src/openrct2/actions/SetParkEntranceFeeAction.cpp +++ b/src/openrct2/actions/SetParkEntranceFeeAction.cpp @@ -73,7 +73,7 @@ public: } }; -static auto Factory = GameActions::Register(GAME_COMMAND_SET_PARK_ENTRANCE_FEE); +static auto Factory UNUSED_ATTR = GameActions::Register(GAME_COMMAND_SET_PARK_ENTRANCE_FEE); extern "C" { diff --git a/src/openrct2/common.h b/src/openrct2/common.h index c23ee0b6a0..3314c05fa9 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -247,6 +247,17 @@ typedef uint16 rct_string_id; #define FASTCALL #endif // PLATFORM_X86 +// C++17 or later +#if defined(__cplusplus) && __cplusplus > 201402L + #define UNUSED_ATTR [[maybe_unused]] +#else + #ifdef __GNUC__ + #define UNUSED_ATTR [[gnu::unused]] + #else + #define UNUSED_ATTR + #endif +#endif + /** * x86 register structure, only used for easy interop to RCT2 code. */