other half of C++ 11 patch