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

Change-Id: I54bd96a104d664853ff46845fc20f856862faf62