[ros-diffs] [cwittich] 18513: fix compile with gcc