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