Add error checking when parsing string
fix for g++0x
main.cpp back to c++0x
cleanup for X86_64
based on CVS release_06