[ros-diffs] [royce] 17829: fix crash in 'make msvc'