[ros-diffs] [hpoussin] 25873: Fix build with gcc 4.1.2