[ros-diffs] [fireball] 22434: GCC 4 fixes, thanks to w3seek