Skip to content
Snippets Groups Projects
Commit 8592b196 authored by Marcel Raad's avatar Marcel Raad
Browse files

Fix variable aliasing warnings

MSVC 14 has new variable shadowing warnings, which are on by default and spam the Boost regression test output:
"warning C4456: declaration of '...' hides previous local declaration".
This renames a few variables to make MSVC happy.
parent 9080d8ce
No related branches found
No related tags found
No related merge requests found
......@@ -442,20 +442,20 @@ private:
if(lookahead)
{
seq += detail::make_independent_end_xpression<BidiIter>(seq.pure());
detail::lookahead_matcher<xpr_type> lookahead(seq.xpr(), negative, seq.pure());
seq = detail::make_dynamic<BidiIter>(lookahead);
detail::lookahead_matcher<xpr_type> lam(seq.xpr(), negative, seq.pure());
seq = detail::make_dynamic<BidiIter>(lam);
}
else if(lookbehind)
{
seq += detail::make_independent_end_xpression<BidiIter>(seq.pure());
detail::lookbehind_matcher<xpr_type> lookbehind(seq.xpr(), seq.width().value(), negative, seq.pure());
seq = detail::make_dynamic<BidiIter>(lookbehind);
detail::lookbehind_matcher<xpr_type> lbm(seq.xpr(), seq.width().value(), negative, seq.pure());
seq = detail::make_dynamic<BidiIter>(lbm);
}
else if(keeper) // independent sub-expression
{
seq += detail::make_independent_end_xpression<BidiIter>(seq.pure());
detail::keeper_matcher<xpr_type> keeper(seq.xpr(), seq.pure());
seq = detail::make_dynamic<BidiIter>(keeper);
detail::keeper_matcher<xpr_type> km(seq.xpr(), seq.pure());
seq = detail::make_dynamic<BidiIter>(km);
}
// restore the modifiers
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment