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