[ros-diffs] [gadamopoulos] 58368: Fix build for gcc