[ros-diffs] [gedmurphy] 22161: more gcc 4.1 fixes