- Made use of the other ::collect variants.
This commit is contained in:
Paul Beckingham 2014-08-22 22:37:53 -04:00
parent f59be41389
commit d4adf13b69

View file

@ -537,14 +537,10 @@ void Parser::getOverrides (
File& rc)
{
std::vector <Tree*> nodes;
collect (nodes, collectTerminated);
collect (nodes, collectLeaf);
std::vector <Tree*>::iterator i;
for (i = nodes.begin (); i != nodes.end (); ++i)
{
// Parser override operator.
if ((*i)->attribute ("raw") == "--")
break;
if ((*i)->hasTag ("RC"))
{
rc = File ((*i)->attribute ("file"));
@ -597,14 +593,10 @@ void Parser::applyOverrides ()
context.debug ("Parse::applyOverrides");
std::vector <Tree*> nodes;
collect (nodes, collectTerminated);
collect (nodes, collectLeaf);
std::vector <Tree*>::iterator i;
for (i = nodes.begin (); i != nodes.end (); ++i)
{
// Parser override operator.
if ((*i)->attribute ("raw") == "--")
break;
if ((*i)->hasTag ("CONFIG"))
{
std::string name = (*i)->attribute ("name");