[ros-diffs] [cwittich] 27437: fix gcc build