[ros-diffs] [gvg] 15631: Make compiler happy