issue #583 removing C++11 code.