Skip to content

Commit a39f037

Browse files
authored
Merge pull request #355 from GLVis/fix-general-text
Removed dependency on general/text.hpp.
2 parents 201e2df + 5c5ef04 commit a39f037

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

lib/file_reader.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "file_reader.hpp"
1313

1414
#include <vector>
15-
#include <general/text.hpp>
1615

1716
using namespace std;
1817
using namespace mfem;
@@ -143,7 +142,10 @@ bool FileReader::CheckStreamIsComplex(std::istream &solin, bool parallel)
143142
solin >> ws;
144143
getline(solin, buff);
145144
solin.seekg(pos);
146-
mfem::filter_dos(buff);
145+
if (!buff.empty() && *buff.rbegin() == '\r')
146+
{
147+
buff.resize(buff.size()-1);
148+
}
147149
const char *header = (parallel)?("ParComplexGridFunction"):
148150
("ComplexGridFunction");
149151
return (buff == header);

lib/stream_reader.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include <array>
1515
#include <algorithm>
16-
#include <general/text.hpp>
1716

1817
using namespace std;
1918
using namespace mfem;

0 commit comments

Comments
 (0)