[ros-diffs] [tkreuzer] 41476: fix x86 compilation