Fix -Wshadow warning.
Merge pull request #1659 from rohit-n/ow-the-edge

Fix -Wshadow warning.