[ros-diffs] [rharabien] 55579: - Fix MSVC build (patch by Thomas Fabber reverted by me in previous commit)