C++ fix: enable some operations on std::map