Merge pull request #4 from rleigh-codelibre/c++98-fixes2

C++98 fixes, part 2

This permits the ICU code to build with the CMake build to be introduced later.