[ros-diffs] [weiden] 24314: Fix GCC4 warnings