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