[ros-diffs] [cwittich] 38664: fix msvc build