From 66cd32a252ee0edab11448b560371878b2189223 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 21 Apr 2019 21:48:08 +0100 Subject: [PATCH] Codechange: Use std::underlying_type for DECLARE_POSTFIX_INCREMENT. --- src/core/enum_type.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/enum_type.hpp b/src/core/enum_type.hpp index 920cb514a8..d5bcf6dbe1 100644 --- a/src/core/enum_type.hpp +++ b/src/core/enum_type.hpp @@ -13,17 +13,17 @@ #define ENUM_TYPE_HPP /** Some enums need to have allowed incrementing (i.e. StationClassID) */ -#define DECLARE_POSTFIX_INCREMENT(type) \ - inline type operator ++(type& e, int) \ +#define DECLARE_POSTFIX_INCREMENT(enum_type) \ + inline enum_type operator ++(enum_type& e, int) \ { \ - type e_org = e; \ - e = (type)((int)e + 1); \ + enum_type e_org = e; \ + e = (enum_type)((std::underlying_type::type)e + 1); \ return e_org; \ } \ - inline type operator --(type& e, int) \ + inline enum_type operator --(enum_type& e, int) \ { \ - type e_org = e; \ - e = (type)((int)e - 1); \ + enum_type e_org = e; \ + e = (enum_type)((std::underlying_type::type)e - 1); \ return e_org; \ }