[ros-diffs] [tkreuzer] 62017: Fix GCC build