Replace make_pair with std::make_pair