Everything is compiling again (yay!).
Fixed one deprecation warning.  Other deprecation warning concerning by_ref seems to be a library problem.