Updating Patrick's C++ exceptions to build without warnings on solaris.