[ros-diffs] [cfinck] 74325: Fix GCC build