add todo for the switch to C++11