Code changes for C++11