[ros-diffs] [royce] 20831: msvc2k5 compatibility fix