[ros-diffs] [cwittich] 20687: fix msvc compile problems