Manually applied merge #133 from Master

This commit is contained in:
Phil Nash 2012-10-31 18:28:21 +00:00
parent 355b95fda1
commit f0f407fc3e

View File

@ -74,6 +74,8 @@ namespace Catch {
m_remainder += c;
}
TagExtracter& operator=(const TagExtracter&);
std::set<std::string>& m_tags;
std::string m_remainder;
};
@ -177,6 +179,8 @@ namespace Catch {
m_exp.m_tagSets.push_back( m_currentTagSet );
}
TagExpressionParser& operator=(const TagExpressionParser&);
bool m_isNegated;
TagSet m_currentTagSet;
TagExpression& m_exp;