[ros-diffs] [weiden] 24502: Fix building with GCC4