[ros-diffs] [janderwald] 25069: - fix build with gcc 4.1.0