Xdr::data() no longer needs comment.c_str()

Author: roystgnr

src/mesh/xdr_io.C

@@ -222,7 +222,7 @@ void XdrIO::write (const std::string & name)
 
           // Write vector of elemset ids to file with comment
           std::string comment_string = "# elemset ids for elemset code " + std::to_string(elemset_code);
-          io.data(elemset_id_vec, comment_string.c_str());
+          io.data(elemset_id_vec, comment_string);
         }
     }
 
@@ -421,7 +421,7 @@ XdrIO::write_serialized_connectivity (Xdr & io,
           legend += "p_level ";
         legend += "(n0 ... nN-1) ]";
         comment += legend;
-        io.data (n_global_elem_at_level[0], comment.c_str());
+        io.data (n_global_elem_at_level[0], comment);
       }
 
       for (auto pid : make_range(this->n_processors()))
@@ -542,7 +542,7 @@ XdrIO::write_serialized_connectivity (Xdr & io,
               buf << "p_level ";
             buf << "(n0 ... nN-1) ]";
 
-            io.data (n_global_elem_at_level[level], buf.str().c_str());
+            io.data (n_global_elem_at_level[level], buf.str());
           }
 
           for (auto pid : make_range(this->n_processors()))
@@ -1161,7 +1161,7 @@ void XdrIO::write_serialized_bcs_helper (Xdr & io, const new_header_id_type n_bc
     {
       std::stringstream comment_string;
       comment_string << "# number of " << bc_type << " boundary conditions";
-      io.data (n_bcs_out, comment_string.str().c_str());
+      io.data (n_bcs_out, comment_string.str());
     }
   n_bcs_out = 0;
 

src/systems/equation_systems_io.C

@@ -529,7 +529,7 @@ void EquationSystems::write(std::string_view name,
               // Note: There is no Xdr::data overload taking a "const
               // std::string &" so we need to make a copy.
               std::string copy = sys_name;
-              io.data (copy, comment.c_str());
+              io.data (copy, comment);
             }
 
             // 4.)
@@ -541,7 +541,7 @@ void EquationSystems::write(std::string_view name,
               comment =  "# Type, System No. ";
               comment += std::to_string(sys_num);
 
-              io.data (sys_type, comment.c_str());
+              io.data (sys_type, comment);
             }
 
             // 5.) - 9.)

src/systems/system_io.C

@@ -1321,7 +1321,7 @@ void System::write_header (Xdr & io,
     comment += "\"";
 
     unsigned int nv = this->n_vars();
-    io.data (nv, comment.c_str());
+    io.data (nv, comment);
   }
 
 
@@ -1338,7 +1338,7 @@ void System::write_header (Xdr & io,
         comment += "\"";
 
         std::string var_name = this->variable_name(var);
-        io.data (var_name, comment.c_str());
+        io.data (var_name, comment);
       }
 
       // 6.1.) Variable subdomains
@@ -1353,7 +1353,7 @@ void System::write_header (Xdr & io,
         const std::set<subdomain_id_type> & domains = this->variable(var).active_subdomains();
         std::vector<subdomain_id_type> domain_array;
         domain_array.assign(domains.begin(), domains.end());
-        io.data (domain_array, comment.c_str());
+        io.data (domain_array, comment);
       }
 
       // 7.)
@@ -1368,7 +1368,7 @@ void System::write_header (Xdr & io,
         comment += "\"";
 
         int order = static_cast<int>(this->variable_type(var).order);
-        io.data (order, comment.c_str());
+        io.data (order, comment);
       }
 
 
@@ -1383,7 +1383,7 @@ void System::write_header (Xdr & io,
         comment += "\"";
 
         int rad_order = static_cast<int>(this->variable_type(var).radial_order);
-        io.data (rad_order, comment.c_str());
+        io.data (rad_order, comment);
       }
 
 #endif
@@ -1400,7 +1400,7 @@ void System::write_header (Xdr & io,
 
         const FEType & type = this->variable_type(var);
         int fam = static_cast<int>(type.family);
-        io.data (fam, comment.c_str());
+        io.data (fam, comment);
 
 #ifdef LIBMESH_ENABLE_INFINITE_ELEMENTS
 
@@ -1411,7 +1411,7 @@ void System::write_header (Xdr & io,
         comment += "\"";
 
         int radial_fam = static_cast<int>(type.radial_family);
-        io.data (radial_fam, comment.c_str());
+        io.data (radial_fam, comment);
 
         comment = "#     Infinite Mapping Type, Variable \"";
         comment += this->variable_name(var);
@@ -1420,7 +1420,7 @@ void System::write_header (Xdr & io,
         comment += "\"";
 
         int i_map = static_cast<int>(type.inf_map);
-        io.data (i_map, comment.c_str());
+        io.data (i_map, comment);
 #endif
       }
     } // end of the variable loop
@@ -1437,7 +1437,7 @@ void System::write_header (Xdr & io,
       comment += "\"";
 
       unsigned int nvecs = write_additional_data ? this->n_vectors () : 0;
-      io.data (nvecs, comment.c_str());
+      io.data (nvecs, comment);
     }
 
     if (write_additional_data)
@@ -1451,13 +1451,13 @@ void System::write_header (Xdr & io,
             comment =  "# Name of " + dth_vector;
             std::string vec_name = pr.first;
 
-            io.data (vec_name, comment.c_str());
+            io.data (vec_name, comment);
             int vec_projection = _vector_projections.at(vec_name);
             comment = "# Whether to do projections for " + dth_vector;
-            io.data (vec_projection, comment.c_str());
+            io.data (vec_projection, comment);
             int vec_type = _vector_types.at(vec_name);
             comment = "# Parallel type of " + dth_vector;
-            io.data (vec_type, comment.c_str());
+            io.data (vec_type, comment);
           }
       }
   }
@@ -1580,7 +1580,7 @@ void System::write_parallel_data (Xdr & io,
     comment += "\" Solution Vector";
   }
 
-  io.data (io_buffer, comment.c_str());
+  io.data (io_buffer, comment);
 
   // total_written_size += io_buffer.size();
 
@@ -1646,7 +1646,7 @@ void System::write_parallel_data (Xdr & io,
             comment += "\"";
           }
 
-          io.data (io_buffer, comment.c_str());
+          io.data (io_buffer, comment);
 
           // total_written_size += io_buffer.size();
         }