[ros-diffs] [gadamopoulos] 74924: Fix gcc build.