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

Change-Id: Icdd14ee93b4a2824cbbd3a4075e0eb2afb94b78c