OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WGRUPCON::read(): Don't shadow the name() method.

Browse Source
This commit is contained in:
Bård Skaflestad 2012-04-13 14:08:45 +02:00
parent f8b3a8c3f9
commit ab9ead475f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/core/eclipse/SpecialEclipseFields.hpp
View File

@ -1340,18 +1340,18 @@ struct WGRUPCON : public SpecialBase
virtual void read(std::istream& is) virtual void read(std::istream& is)
{ {
while(is) { while(is) {
std::string name = readString(is); std::string wname = readString(is);
if (name[0] == '/') { if (wname[0] == '/') {
is >> ignoreLine; is >> ignoreLine;
break; break;
} }
while (name.find("--") == 0) { while (wname.find("--") == 0) {
// This line is a comment // This line is a comment
is >> ignoreLine; is >> ignoreLine;
name = readString(is); wname = readString(is);
} }
WgrupconLine wgrupcon_line; WgrupconLine wgrupcon_line;
wgrupcon_line.well_ = name; wgrupcon_line.well_ = wname;
std::string available = readString(is); std::string available = readString(is);
if (available[available.size()-1] == '*') if (available[available.size()-1] == '*')
{ {