Added noexcept specifier to hash functions

CleverRaven · Dec 3, 2019 · ea5546d · ea5546d
1 parent af5b035
commit ea5546d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/active_item_cache.h b/src/active_item_cache.h
@@ -27,7 +27,7 @@ namespace std
 {
 template <>
 struct hash<special_item_type> {
-    std::size_t operator()( const special_item_type &k ) const {
+    std::size_t operator()( const special_item_type &k ) const noexcept {
         return static_cast<size_t>( k );
     }
 };

diff --git a/src/color.h b/src/color.h
@@ -382,7 +382,7 @@ namespace std
 {
 template<>
 struct hash<nc_color> {
-    std::size_t operator()( const nc_color &v ) const {
+    std::size_t operator()( const nc_color &v ) const noexcept {
         return hash<int>()( v.operator int() );
     }
 };

diff --git a/src/int_id.h b/src/int_id.h
@@ -119,7 +119,7 @@ namespace std
 {
 template<typename T>
 struct hash< int_id<T> > {
-    std::size_t operator()( const int_id<T> &v ) const {
+    std::size_t operator()( const int_id<T> &v ) const noexcept {
         return hash<int>()( v.to_i() );
     }
 };

diff --git a/src/point.h b/src/point.h
@@ -318,7 +318,7 @@ namespace std
 {
 template <>
 struct hash<point> {
-    std::size_t operator()( const point &k ) const {
+    std::size_t operator()( const point &k ) const noexcept {
         constexpr uint64_t a = 2862933555777941757;
         size_t result = k.y;
         result *= a;
@@ -334,7 +334,7 @@ namespace std
 {
 template <>
 struct hash<tripoint> {
-    std::size_t operator()( const tripoint &k ) const {
+    std::size_t operator()( const tripoint &k ) const noexcept {
         constexpr uint64_t a = 2862933555777941757;
         size_t result = k.z;
         result *= a;

diff --git a/src/savegame_legacy.cpp b/src/savegame_legacy.cpp
@@ -36,7 +36,7 @@ namespace std
 template <>
 struct hash<talk_topic_enum> {
     // Operator overload required by std API.
-    std::size_t operator()( const talk_topic_enum &k ) const {
+    std::size_t operator()( const talk_topic_enum &k ) const noexcept {
         return k; // the most trivial hash of them all
     }
 };

diff --git a/src/string_id.h b/src/string_id.h
@@ -202,7 +202,7 @@ namespace std
 {
 template<typename T>
 struct hash< string_id<T> > {
-    std::size_t operator()( const string_id<T> &v ) const {
+    std::size_t operator()( const string_id<T> &v ) const noexcept {
         return hash<std::string>()( v.str() );
     }
 };