Fix up things to build with older, non c++11 compilers
Authored by: Jean-Francois Dockes 2015-04-01
Parent(s): [07e20f]
Child(ren): [dd6dfa]