@@ -652,8 +652,8 @@ class cppfront
652
652
bool suppress_move_from_last_use = false ;
653
653
654
654
struct arg_info {
655
- passing_style pass = passing_style::in;
656
- token const * token = nullptr ;
655
+ passing_style pass = passing_style::in;
656
+ token const * ptoken = nullptr ;
657
657
};
658
658
std::vector<arg_info> current_args = { {} };
659
659
@@ -1099,7 +1099,7 @@ class cppfront
1099
1099
// For an explicit 'forward' apply forwarding to correct identifier
1100
1100
assert (!current_args.empty ());
1101
1101
if (current_args.back ().pass == passing_style::forward) {
1102
- add_std_forward = current_args.back ().token == n.identifier ;
1102
+ add_std_forward = current_args.back ().ptoken == n.identifier ;
1103
1103
}
1104
1104
1105
1105
if (add_std_move) {
@@ -1628,9 +1628,9 @@ class cppfront
1628
1628
if (current_args.back ().pass == passing_style::forward)
1629
1629
{
1630
1630
assert (n.expr ->get_token ());
1631
- assert (!current_args.back ().token );
1632
- current_args.back ().token = n.expr ->get_token ();
1633
- auto decl = sema.get_local_declaration_of (*current_args.back ().token );
1631
+ assert (!current_args.back ().ptoken );
1632
+ current_args.back ().ptoken = n.expr ->get_token ();
1633
+ auto decl = sema.get_local_declaration_of (*current_args.back ().ptoken );
1634
1634
if (!(decl && decl->parameter && decl->parameter ->pass == passing_style::forward)) {
1635
1635
errors.emplace_back (
1636
1636
n.position (),
0 commit comments