X-Git-Url: https://git.donarmstrong.com/?p=bamtools.git;a=blobdiff_plain;f=src%2Futils%2Fbamtools_filter_engine.h;h=9fb2f591fa3ee21c328989b23874563e6c96801d;hp=2ece5e71e1e7b1206cec758892c6d074a2270855;hb=75af0fbc1c88cb67f2a91f79de53b0ec7a7211c3;hpb=d401178e05192f099e9b86420c5ab4a8cb0618c2 diff --git a/src/utils/bamtools_filter_engine.h b/src/utils/bamtools_filter_engine.h index 2ece5e7..9fb2f59 100644 --- a/src/utils/bamtools_filter_engine.h +++ b/src/utils/bamtools_filter_engine.h @@ -2,7 +2,7 @@ // bamtools_filter_engine.h (c) 2010 Derek Barnett, Erik Garrison // Marth Lab, Department of Biology, Boston College // --------------------------------------------------------------------------- -// Last modified: 10 October 2011 +// Last modified: 3 May 2013 // --------------------------------------------------------------------------- // Provides a generic filter engine based on filter-sets of properties, // with possible "rules" (compound logical expressions) to create more complex @@ -294,7 +294,6 @@ bool FilterEngine::evaluateFilterRules(const T& query) { std::stack resultStack; FilterMap::const_iterator filterIter; - FilterMap::const_iterator filterEnd = m_filters.end(); std::queue ruleQueueCopy = m_ruleQueue; while ( !ruleQueueCopy.empty() ) { const std::string& token = ruleQueueCopy.front(); @@ -325,7 +324,7 @@ bool FilterEngine::evaluateFilterRules(const T& query) { else { // look up PropertyFilter that matches this token filterIter = m_filters.find(token); - BAMTOOLS_ASSERT_MESSAGE( (filterIter != filterEnd), "Filter mentioned in rule, not found in FilterEngine" ); + BAMTOOLS_ASSERT_MESSAGE( (filterIter != m_filters.end() ), "Filter mentioned in rule, not found in FilterEngine" ); const PropertyFilter& filter = (*filterIter).second; bool result = m_checker.check(filter, query); resultStack.push( result );