Try to fix the travis-ci build.

Claims to have broken on https://travis-ci.org/mozilla/rr/builds/29651875 , but I don't immediately see why that is.  At any rate, help gcc 4.6 unify this `auto` type.