IOSS: Use std::max

sandialabs · Nov 5, 2024 · e5f7890 · e5f7890
1 parent 56e96f0
commit e5f7890
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C
@@ -428,11 +428,9 @@ namespace {
     size_t max_face = std::string("Face Count").length();
     for (auto &eb : ebs) {
       const std::string &name = eb->name();
-      if (name.length() > max_name) {
-        max_name = name.length();
-      }
+      max_name = std::max(name.length(), max_name)
       size_t face_width = Ioss::Utils::number_width(boundary_faces[name].size());
-      max_face          = face_width > max_face ? face_width : max_face;
+      max_face = std::max(face_width, max_face);
     }
     max_name += 4; // Padding
     max_face += 4;

diff --git a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C
@@ -496,9 +496,7 @@ namespace {
     for (const auto &zone : zones) {
       if (zone->is_active()) {
         auto len = zone->m_name.length();
-        if (len > name_len) {
-          name_len = len;
-        }
+        name_len = std::max(name_len, len);
       }
     }
 

diff --git a/packages/seacas/libraries/ioss/src/main/skinner.C b/packages/seacas/libraries/ioss/src/main/skinner.C
@@ -65,11 +65,9 @@ namespace {
     size_t max_face = std::string("Face Count").length();
     for (auto &eb : ebs) {
       const std::string &name = eb->name();
-      if (name.length() > max_name) {
-        max_name = name.length();
-      }
+      max_name = std::max(max_name, name.length());
       size_t face_width = Ioss::Utils::number_width(boundary_faces[name].size());
-      max_face          = face_width > max_face ? face_width : max_face;
+      max_face = std::max(max_face, face_width);
     }
     max_name += 4; // Padding
     max_face += 4;