Merge remote-tracking branch 'origin/master' into refactor-table-reading

2020-06-05 12:09:57 -04:00
parent cd08dc8425 863828540a
commit 7df387f7d5
65 changed files with 647 additions and 837 deletions
--- a/src/text_file_reader.cpp
+++ b/src/text_file_reader.cpp
@ -77,7 +77,7 @@ char *TextFileReader::next_line(int nparams) {
    if (ptr == nullptr) {
      // EOF
      if (nwords > 0 && nwords < nparams) {
-        throw EOFException(fmt::format("Incorrect format in {} file! {}/{} parameters", filetype.c_str(), nwords, nparams));
+        throw EOFException(fmt::format("Incorrect format in {} file! {}/{} parameters", filetype, nwords, nparams));
      }
      return nullptr;
    }