[ros-diffs] [weiden] 25715: Fix compilation