dumb down our CPP so that it works in both traditional and ansi modes
Merge pull request #22 from dagit/clang-workarounds

dumb down our CPP so that it works in both traditional and ansi modes