[ros-diffs] [fireball] 50564: - Fix compiling in recent trunk.