Merge pull request #33053 from CleverRaven/fix-jenkins-gcc-builds-201…

…9-08-08 Change enum class from char to int
CleverRaven · Aug 9, 2019 · c5f4659 · c5f4659
2 parents aee7ee1 + adbabd4
commit c5f4659
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/active_item_cache.h b/src/active_item_cache.h
@@ -17,12 +17,22 @@ struct item_reference {
     safe_reference<item> item_ref;
 };
 
-enum class special_item_type : char {
+enum class special_item_type : int {
     none,
     corpse,
     explosive
 };
 
+namespace std
+{
+template <>
+struct hash<special_item_type> {
+    std::size_t operator()( const special_item_type &k ) const {
+        return static_cast<size_t>( k );
+    }
+};
+} // namespace std
+
 class active_item_cache
 {
     private:

diff --git a/src/map.h b/src/map.h
@@ -64,7 +64,7 @@ class zone_data;
 struct trap;
 
 enum direction : unsigned;
-enum class special_item_type : char;
+enum class special_item_type : int;
 using itype_id = std::string;
 template<typename T>
 class visitable;