[ros-diffs] [sedwards] 17551: fix msvc compile