[mr2644] fix compile after 2636/2643. c++11 currently not in mainstream.