From 683778fd7af8c3d71460afbebd305a62959ca409 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
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 31df2a3905..fc89b9489e 100644
--- a/src/core/enum_type.hpp
+++ b/src/core/enum_type.hpp
@@ -15,17 +15,17 @@
 #include <type_traits>
 
 /** 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<enum_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<enum_type>::type)e - 1); \
 		return e_org; \
 	}