IOSS: Do not use default case in switch if possible

sandialabs · Feb 2, 2025 · 5f41a7e · 5f41a7e
1 parent 357a03d
commit 5f41a7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/seacas/libraries/ioss/src/Ioss_Field.C b/packages/seacas/libraries/ioss/src/Ioss_Field.C
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2024 National Technology & Engineering Solutions
+// Copyright(C) 1999-2025 National Technology & Engineering Solutions
 // of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 // NTESS, the U.S. Government retains certain rights in this software.
 //
@@ -407,8 +407,8 @@ std::string Ioss::Field::type_string(Ioss::Field::BasicType type)
   case Ioss::Field::STRING: return {"string"};
   case Ioss::Field::CHARACTER: return {"char"};
   case Ioss::Field::INVALID: return {"invalid"};
-  default: return {"internal error"};
   }
+  return {"internal error"};
 }
 
 std::string Ioss::Field::role_string() const { return role_string(get_role()); }
@@ -417,14 +417,15 @@ std::string Ioss::Field::role_string(Ioss::Field::RoleType role)
 {
   switch (role) {
   case Ioss::Field::INTERNAL: return {"Internal"};
+  case Ioss::Field::MAP: return {"Map"};
   case Ioss::Field::MESH: return {"Mesh"};
   case Ioss::Field::ATTRIBUTE: return {"Attribute"};
   case Ioss::Field::COMMUNICATION: return {"Communication"};
   case Ioss::Field::MESH_REDUCTION: return {"Mesh Reduction"};
   case Ioss::Field::REDUCTION: return {"Reduction"};
   case Ioss::Field::TRANSIENT: return {"Transient"};
-  default: return {"internal error"};
   }
+  return {"internal error"};
 }
 
 namespace {

diff --git a/packages/seacas/libraries/ioss/src/Ioss_Property.C b/packages/seacas/libraries/ioss/src/Ioss_Property.C
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2021, 2023 National Technology & Engineering Solutions
+// Copyright(C) 1999-2021, 2023, 2025 National Technology & Engineering Solutions
 // of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 // NTESS, the U.S. Government retains certain rights in this software.
 //
@@ -22,8 +22,8 @@ namespace {
     case Ioss::Property::STRING: return {"string"};
     case Ioss::Property::VEC_INTEGER: return {"vector<int>"};
     case Ioss::Property::VEC_DOUBLE: return {"vector<double>"};
-    default: return {"internal error"};
     }
+    return {"internal error"};
   }
 
   void error_message(const Ioss::Property &property, const std::string &requested_type)