[ros-diffs] [arty] 26319: Tweaks for gcc 4.