issue: #440936 make 'for_next' branch c++ compatible - step #4

Change-Id: Ie7007e89a336fffb65175d0377ee43dcb1b1a5dd