Backed out 2 changesets (bug 871315) because different compilers have different standards on what is and is not C++

Backed out changeset d0d2e13e8b83 (bug 871315)
Backed out changeset be3976bd2d57 (bug 871315)

Landed on a CLOSED TREE