Make compatible with gcc >=4.7

Signed-off-by: Paul Beeler <sparksco@gmail.com>