[ros-diffs] [weiden] 25573: Yet another fix for GCC4.2