Fix the g++ build.

It turns out that the g++ test build, initiated by "make presubmit", was
actually using clang++ for the build.  This fixes the makefile, plus the
code that actually produces errors under the g++ build.

BUG= none
TBR=jpp

Review URL: https://codereview.chromium.org/1572863003 .