[ros-diffs] [royce] 18549: msvc6 compilation fixes