[ros-diffs] [tkreuzer] 55398: Fix gcc build