Small fixes for o2scl 0.915 and c++11.