From f89f5469a44b02d8f41ef0a030898a4d141794bf Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 26 Apr 2014 11:53:05 -0700 Subject: [PATCH] Shell - Converted from A3 to A3t. Still doesn't work though. --- src/shell/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/shell/main.cpp b/src/shell/main.cpp index 944c2aac3..63b23a5e4 100644 --- a/src/shell/main.cpp +++ b/src/shell/main.cpp @@ -109,16 +109,16 @@ int main (int argc, const char** argv) // Make a copy because context.clear will delete them. std::string permanent_overrides; - std::vector ::iterator i; - for (i = context.a3.begin (); i != context.a3.end (); ++i) + std::vector ::iterator i; + for (i = context.a3t.tree ()->_branches.begin (); i != context.a3t.tree ()->_branches.end (); ++i) { - if (i->_category == Arg::cat_rc || - i->_category == Arg::cat_override) + if ((*i)->hasTag ("RC") || + (*i)->hasTag ("CONFIG")) { - if (i != context.a3.begin ()) + if (i != context.a3t.tree ()->_branches.begin ()) permanent_overrides += " "; - permanent_overrides += i->_raw; + permanent_overrides += (*i)->attribute ("raw"); } }