[ros-diffs] [mnordell] 29519: Make cabman build warning-free