[ros-diffs] [gadamopoulos] 69371: Fix gcc build