adapt implementation to WG21 proposal, adding a wrapper template for
improved handling

svn path=; revision=16679
Removed old branches.

svn path=; revision=38550