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

Fix #7165: SmallMap::Erase(key) does not work correctly #7428

Merged
merged 2 commits into from Mar 28, 2019

Conversation

@stormcone
Copy link
Contributor

stormcone commented Mar 27, 2019

No description provided.

stormcone and others added 2 commits Mar 27, 2019
Const and non-const Find() have different return types.
Copy link
Contributor

M3Henry left a comment

Now that you mention this, I'm surprised that it even compiles at the moment

@michicc

This comment has been minimized.

Copy link
Member

michicc commented Mar 27, 2019

The magic of templates and unused stuff.

@LordAro LordAro merged commit 21d9e87 into OpenTTD:master Mar 28, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190327.17 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.8) Linux linux-amd64-clang-3.8 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
@stormcone stormcone deleted the stormcone:smallmap_erase branch Mar 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.