Fix warning about 'requires' being a keyword.

This commit is contained in:
Richard Kimberly Heck 2020-03-16 01:31:09 -04:00
parent 7c7ea3113f
commit ada09a2cda

View File

@ -1433,7 +1433,7 @@ bool TextClass::readFloat(Lexer & lexrc)
string style;
string type;
string within;
string requires;
string required;
bool usesfloat = true;
bool ispredefined = false;
bool allowswide = true;
@ -1511,7 +1511,7 @@ bool TextClass::readFloat(Lexer & lexrc)
break;
case FT_REQUIRES:
lexrc.next();
requires = lexrc.getString();
required = lexrc.getString();
break;
case FT_PREDEFINED:
lexrc.next();
@ -1563,9 +1563,9 @@ bool TextClass::readFloat(Lexer & lexrc)
"not be able to produce a float list.");
}
Floating fl(type, placement, ext, within, style, name,
listname, listcommand, refprefix, allowed_placement,
htmltag, htmlattr, htmlstyle, requires, usesfloat,
ispredefined, allowswide, allowssideways);
listname, listcommand, refprefix, allowed_placement,
htmltag, htmlattr, htmlstyle, required, usesfloat,
ispredefined, allowswide, allowssideways);
floatlist_.newFloat(fl);
// each float has its own counter
counters_.newCounter(from_ascii(type), from_ascii(within),