[ros-diffs] [rharabien] 55616: - Fix MSVC build