Merge pull request gcc-mirror#74 from iains/contracts-nonattr-fix-wrapper-dups

c++, contracts: Avoid duplicating wrapper functions.

Author: villevoutilainen