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

This commit is contained in:
Bård Skaflestad 2012-04-13 14:08:45 +02:00
parent f8b3a8c3f9
commit ab9ead475f

View File

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