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

Change-Id: I8c3d372053cc8c5640e155c44b74d8da2b0c56c0