[ros-diffs] [weiden] 24470: Fix compilation with GCC4