Remove shadowed variables from header.

See also http://www.zeroc.com/forums/patches/6336-minor-patch-basicstream-h-remove-shadowed-variables.html

Approved by: mentors (implicit)