[ros-diffs] [hpoussin] 21869: Fix compilation with GCC4