[ros-diffs] [janderwald] 25054: - fix msvc compile problems