[ros-diffs] [tfaber] 55668: [CABMAN] - Fix MSVC build