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

Change-Id: I001ddb8fe388b36fdf41764096389fd1c1ec226b