adding typedef to TokenMap, using TokenMapType::value_type instead of std::make_pair to make Sun compiler happy