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