Remove C++11 dependency from C++ version.