Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Codechange: Emplace std::pair instead of creating then inserting. #12538

Merged
merged 2 commits into from
Apr 20, 2024

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Apr 20, 2024

Motivation / Problem

In various places we create a std::pair, then call std::map's insert, or push it onto a std::vector. This may create two pairs, one as a local temporary, which is then copied into its resting location.

Description

Both std::map and std::vector have emplace functions which avoid this and create the pair in-place, so use them.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, game_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

This avoids a copy of the pair into the map.
This creates the pair in the vector, instead of creating it then copying it in.
@PeterN PeterN merged commit 40fa45a into OpenTTD:master Apr 20, 2024
14 checks passed
@PeterN PeterN deleted the emplace-pair branch April 20, 2024 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants