All G++ Tests compile and link

with the exception of the HgTypeListTestSuite.

Cleaning up modified code before merge to master.