Merge branch '2.4.3' into lexer2

This commit is contained in:
Paul Beckingham
2015-03-20 17:16:48 -04:00
49 changed files with 876 additions and 850 deletions

View File

@@ -529,10 +529,13 @@ void CLI::applyOverrides ()
////////////////////////////////////////////////////////////////////////////////
// Extract all the FILTER-tagged items.
const std::string CLI::getFilter ()
const std::string CLI::getFilter (bool applyContext /* = true */)
{
// Handle context setting
addContextFilter ();
// Commands that don't want to respect current context should leverage
// the applyContext argument
if (applyContext)
addContextFilter ();
std::string filter = "";
if (_args.size ())