[patch] Fix some pedantic warnings

[Jonathan Wakely]

This fixes some warnings when building the library with -Wpedantic
(some only show up when also building with -Wsystem-headers).

Tested x86_64-linux, committed to trunk.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch.txt
Type: text/x-patch
Size: 4561 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/libstdc++/attachments/20140624/442459a2/attachment.bin>