[ros-diffs] [cfinck] 74328: Fix GCC build, part 4/X (losing my optimism)