[ros-diffs] [cwittich] 18634: fix compile problems with msvc6